Changeset 865

Show
Ignore:
Timestamp:
11/01/07 01:14:56 (10 months ago)
Author:
evanweaver
Message:

oops... gems is quite necessary

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Rakefile

    r863 r865  
    1616  p.need_tgz = true 
    1717 
    18   case RUBY_PLATFORM  
    19   when /mswin/ 
    20     p.certificate_chain = ['~/gem_certificates/mongrel-public_cert.pem',  
    21       '~/gem_certificates/luislavena-mongrel-public_cert.pem'] 
    22   else 
     18#  case RUBY_PLATFORM  
     19#  when /mswin/ 
     20#    p.certificate_chain = ['~/gem_certificates/mongrel-public_cert.pem',  
     21#      '~/gem_certificates/luislavena-mongrel-public_cert.pem'] 
     22#  else 
    2323    p.certificate_chain = ['~/p/configuration/gem_certificates/mongrel/mongrel-public_cert.pem',  
    2424      '~/p/configuration/gem_certificates/evan_weaver-mongrel-public_cert.pem'] 
    25   end 
     25#  end 
    2626 
    2727  p.eval = proc do   
    …… 
    199199     
    200200    # XXX Hack, because only Luis can package for Win32 right now 
    201     # sh "cp ~/Downloads/mongrel-#{e.version}-mswin32.gem pkg/gems/" 
    202     # sh "cp ~/Downloads/mongrel_service-0.3.3-mswin32.gem pkg/gems/"   
     201    sh "cp ~/Downloads/mongrel-#{e.version}-mswin32.gem pkg/gems/" 
     202    sh "cp ~/Downloads/mongrel_service-0.3.3-mswin32.gem pkg/gems/"   
    203203    sh "rm -rf pkg/mongrel*" 
    204204    sh "gem generate_index -d pkg"   

  • trunk/TODO

    r854 r865  
    22v1.2. Rewrite and merge mongrel cluster and mongrel_rails into something small and maintainable. Remove gem_plugin entirely. 
    33 
     4v1.1.1. See if Java is setting the server version string in the request properly. 
     5 

  • trunk/bin/mongrel_rails

    r807 r865  
    125125 
    126126      config.run 
    127       config.log "Mongrel available at #{@address}:#{@port}" 
     127      config.log "Mongrel #{Mongrel::Const::MONGREL_VERSION} available at #{@address}:#{@port}" 
    128128 
    129129      if config.defaults[:daemon] 

  • trunk/lib/mongrel.rb

    r858 r865  
    349349 
    350350$LOAD_PATH.unshift 'projects/mongrel_experimental/lib/' 
    351 Mongrel::Gems.require 'mongrel_experimental', '=1.1' 
     351Mongrel::Gems.require 'mongrel_experimental', ">=#{Mongrel::Const::MONGREL_VERSION}" 

  • trunk/projects/mongrel_experimental/lib/mongrel_experimental.rb

    r846 r865  
    11 
    22require 'uri_classifier' 
    3 STDERR.puts "** mongrel_experimental loaded" 
     3STDERR.puts "** Mongrel_experimental loaded" 

  • trunk/site/src/news.include

    r832 r865  
    11<dl> 
     2  <dt>Nov-1-2007</dt> 
     3  <dd> 
     4  <h5><a href="{relocatable: news.html}">Mongrel 1.1, caffeinated edition</a></h5> 
     5 
     6  <p>Mongrel 1.1 is out, with JRuby support. Mongrel_cluster is also updated to 1.0.4.</p> 
     7  <a href="http://rubyforge.org/frs/?group_id=1306" title="Downloads">Download</a> 
     8  <a href="{relocatable: news.html}"><img src="{relocatable: images/li4.gif}" alt="more" /><br /></a></p> 
     9  </dd> 
     10   
    211  <dt>Oct-29-2007</dt> 
    312  <dd> 
    4   <h5><a href="{relocatable: news.html}">Mongrel 1.0.4 released</a></h5> 
     13  <h5><a href="{relocatable: news.html}">Mongrel 1.0.4, bugfix release</a></h5> 
    514 
    615  <p>Mongrel 1.0.4 is out. It fixes three bugs that were introduced in 1.0.3.</p> 

  • trunk/site/src/news.page

    r862 r865  
    88h1. Latest News 
    99 
    10 h2. Nov 1: Mongrel 1.1, Java edition 
    11  
    12 Mongrel 1.1. It adds JRuby support. Mongrel_cluster is also updated to 1.0.4, with fixes for a Capistrano recipe bug. 
     10h2. Nov 1: Mongrel 1.1, caffeinated edition 
     11 
     12Mongrel 1.1 is out, with JRuby support. Mongrel_cluster is also updated to 1.0.4, with fixes for a Capistrano recipe bug. The URIClassifier has been updated; if you still need the old one (you don't), it's available in the mongrel_experimental gem. 
    1313 
    1414h2. Oct 29: Mongrel 1.0.4, spooky.