trinidad 0.9.1 → 0.9.2

data/History.txt

@@ -1,3 +1,10 @@
+== 0.9.2 (2010-05-24)
+
+* Autoload the rackup file when it's under the directory WEB-INF.
+* Let jruby-rack reads the rackup file instead of passing its content as an init parameter.
+* Allow to configure the rack servlet from the configuration options.
+* Allow to use crt files to configure SSL
+
 == 0.9.1 (2010-05-09)
 
 * Move all configuration logic to a Lifecycle listener:
@@ -5,6 +12,7 @@
     - Avoids workarounds in the hotdeploy extension.
 * Disable more Tomcat's default behaviours. Process Tlds is also disabled.
 * Allow to specify webapp extensions in the extensions root section.
+* Allow to configure the Http connector.
 
 == 0.9.0 (2010-04-28)
 

data/README.rdoc

@@ -11,22 +11,42 @@ This project was initially called "Tomcat-rails" but due to legal issues with th
 
 == USAGE:
 
-  cd myrailsapp
-  jruby -S trinidad
-  
+Rails applications:
+
+    $ cd myrailsapp
+    $ jruby -S trinidad
+
+Rack applications:
+
+    $ cd myrackapplication
+
+    $ jruby -S trinidad -r path_to_rackup/rackup_file
+
+    or if the name of the file is config.ru
+
+    $ jruby -S trinidad -r path_to_rackup
+
+    or if config.ru is in the base directory
+
+    $ jruby -S trinidad -r
+
+    or if config.ru is under the directory WEB-INF
+
+    $ jruby -S trinidad
+
 == CONFIGURATION:
 
 Trinidad allows you to configure some parameters when the server is started from the command line, the following is a list of the currently supported options:
 
-  * -p, --port PORT         =>    port to bind to.
-  * -e, --env ENVIRONMENT   =>    rails environment.
-  * -c, --context CONTEXT   =>    application context path.
-  * --lib, --jars LIBS_DIR  =>    directory containing jars.
-  * --classes CLASSES_DIR   =>    directory containing classes.
-  * --rackup [RACKUP_FILE]  =>    run a provided rackup file instead of a rails application, by default it's config.ru.
-  * --public PUBLIC_DIR     =>    specify the public directory for your application, by default it's 'public'.
-  * -t, --threadsafe        =>    shortcut to work in threadsafe mode. Setting jruby_min_runtimes and jruby_max_runtimes to 1 in the configuration file the server behaves as the same way.
-  * -l, --load EXTENSION_NAME => loads an extension to use its command line options.
+  * -p, --port PORT             =>  port to bind to.
+  * -e, --env ENVIRONMENT       =>  rails environment.
+  * -c, --context CONTEXT       =>  application context path.
+  * --lib, --jars LIBS_DIR      =>  directory containing jars.
+  * --classes CLASSES_DIR       =>  directory containing classes.
+  * -r, --rackup [RACKUP_FILE]  =>  run a provided rackup file instead of a rails application, by default it's config.ru.
+  * --public PUBLIC_DIR         =>  specify the public directory for your application, by default it's 'public'.
+  * -t, --threadsafe            =>  shortcut to work in threadsafe mode. Setting jruby_min_runtimes and jruby_max_runtimes to 1 in the configuration file the server behaves as the same way.
+  * -l, --load EXTENSION_NAME   =>  loads an extension to use its command line options.
 
 The server can also be configured from a yaml file. If a file is not especified, the server tries to load the file <em>config/tomcat.yml</em>. Within this file you can add other options like jruby.min.runtimes(:jruby_min_runtimes) or jruby.max.runtimes(:jruby_max_runtimes).
 

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/lib/trinidad.rb

@@ -3,6 +3,10 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 require "java"
 require 'rubygems'
+
+require 'jruby-rack'
+require JRubyJars.jruby_rack_jar_path
+
 gem 'trinidad_jars'
 
 require 'trinidad/core_ext'

data/lib/trinidad/rackup_web_app.rb

@@ -3,14 +3,13 @@ module Trinidad
 
     def init_params
       super
-      add_parameter_unless_exist 'rackup', rackup_script
+      if rackup_path = rackup
+        rackup_path = File.join(rackup_path, 'config.ru') if File.directory?(rackup_path)
+        add_parameter_unless_exist('rackup.path', rackup_path)
+      end
       @params
     end
 
     def context_listener; 'org.jruby.rack.RackServletContextListener'; end
-
-    def rackup_script
-      File.read(File.join(web_app_dir, rackup))
-    end
   end
 end

data/lib/trinidad/server.rb

@@ -73,7 +73,7 @@ module Trinidad
         connector.setProperty(key.to_s, value.to_s)
       end
 
-      @tomcat.getService().addConnector(connector)
+      @tomcat.service.add_connector(connector)
       connector
     end
 
@@ -87,11 +87,14 @@ module Trinidad
         :secure => true,
         :SSLEnabled => 'true'
       })
-      options[:keystore] ||= 'ssl/keystore'
-      options[:keystorePass] ||= 'waduswadus'
+
+      if !options[:keystore] && !options[:SSLCertificateFile]
+        options[:keystore] = 'ssl/keystore'
+        options[:keystorePass] = 'waduswadus'
+      end
 
       add_service_connector(options)
-      create_default_keystore(options) unless File.exist?(options[:keystore])
+      create_default_keystore(options)
     end
 
     def add_http_connector
@@ -116,10 +119,12 @@ module Trinidad
     end
 
     def create_default_keystore(config)
+      return if !config[:keystore] || File.exist?(config[:keystore])
+
       keystore_file = java.io.File.new(config[:keystore])
 
-      if (!keystore_file.parent_file.exists() &&
-              !keystore_file.parent_file.mkdir())
+      if (!keystore_file.parent_file.exists &&
+              !keystore_file.parent_file.mkdir)
           raise "Unable to create keystore folder: " + keystore_file.parent_file.canonical_path
       end
 
@@ -138,7 +143,7 @@ module Trinidad
 
     def start
       @tomcat.start
-      @tomcat.getServer().await
+      @tomcat.server.await
     end
 
     private
@@ -156,19 +161,19 @@ module Trinidad
     end
 
     def enable_naming
-      @tomcat.getServer().addLifecycleListener(Trinidad::Tomcat::NamingContextListener.new)
+      @tomcat.server.add_lifecycle_listener(Trinidad::Tomcat::NamingContextListener.new)
 
-      JSystem.setProperty("catalina.useNaming", "true")
+      JSystem.set_property("catalina.useNaming", "true")
 
       value = "org.apache.naming"
-      old_value = JSystem.getProperty(JContext.URL_PKG_PREFIXES) || value
+      old_value = JSystem.get_property(JContext::URL_PKG_PREFIXES) || value
 
       value = value + ":" + old_value unless old_value.include?(value)
-      JSystem.setProperty(JContext.URL_PKG_PREFIXES, value)
+      JSystem.set_property(JContext::URL_PKG_PREFIXES, value)
 
-      value = JSystem.getProperty(JContext.INITIAL_CONTEXT_FACTORY)
+      value = JSystem.get_property(JContext::INITIAL_CONTEXT_FACTORY)
       unless value
-        JSystem.setProperty(JContext.INITIAL_CONTEXT_FACTORY, "org.apache.naming.java.javaURLContextFactory")
+        JSystem.set_property(JContext::INITIAL_CONTEXT_FACTORY, "org.apache.naming.java.javaURLContextFactory")
       end
     end
 

data/lib/trinidad/web_app.rb

@@ -3,7 +3,7 @@ module Trinidad
     attr_reader :config, :app_config, :class_loader, :servlet
 
     def self.create(config, app_config)
-      app_config.has_key?(:rackup) ? RackupWebApp.new(config, app_config) : RailsWebApp.new(config, app_config)
+      rackup?(app_config) ? RackupWebApp.new(config, app_config) : RailsWebApp.new(config, app_config)
     end
 
     def initialize(config, app_config, servlet_class = 'org.jruby.rack.RackServlet', servlet_name = 'RackServlet')
@@ -11,7 +11,8 @@ module Trinidad
       @app_config = app_config
 
       @class_loader = org.jruby.util.JRubyClassLoader.new(JRuby.runtime.jruby_class_loader)
-      @servlet = {:class => servlet_class, :name => servlet_name} unless rack_servlet_configured?
+
+      configure_rack_servlet(servlet_class, servlet_name) unless rack_servlet_configured?
     end
 
     def rack_listener
@@ -77,5 +78,18 @@ module Trinidad
         return $1
       end
     end
+
+    def configure_rack_servlet(servlet_class, servlet_name)
+      servlet_config = @config[:servlet] || @app_config[:servlet]
+      if servlet_config
+        servlet_class = servlet_config[:class]
+        servlet_name = servlet_config[:name]
+      end
+      @servlet = {:class => servlet_class, :name => servlet_name}
+    end
+
+    def self.rackup?(app_config)
+      app_config.has_key?(:rackup) || !Dir['WEB-INF/**/config.ru'].empty?
+    end
   end
 end

data/spec/trinidad/fakeapp.rb

@@ -71,8 +71,8 @@ EOF
 EOF
   end
 
-  def create_rackup_file
-    @rackup ||= config_file 'config/config.ru', <<-EOF
+  def create_rackup_file(path = 'config')
+    @rackup ||= config_file File.join(path, 'config.ru'), <<-EOF
 require 'rubygems'
 require 'sinatra'
 

data/spec/trinidad/server_spec.rb

@@ -32,6 +32,7 @@ describe Trinidad::Server do
       :web_app_dir => MOCK_WEB_APP_DIR})
 
     server.ssl_enabled?.should be_true
+    File.exist?('ssl').should be_true
   end
 
   it "enables ajp when config param is a number" do
@@ -131,24 +132,38 @@ describe Trinidad::Server do
     connector.get_property('maxKeepAliveRequests').should == 4
     connector.get_property('socket.bufferPool').should == '1000'
   end
-  
+
   it "adds the WebAppLifecycleListener to each webapp" do
     server = Trinidad::Server.new({:web_app_dir => MOCK_WEB_APP_DIR})
     app_context = server.tomcat.host.find_child('/')    
-    
+
     app_context.find_lifecycle_listeners.map {|l| l.class.name }.should include('Trinidad::WebAppLifecycleListener')
   end
-  
+
   it "loads application extensions from the root of the configuration" do
     server = Trinidad::Server.new({
       :web_app_dir => MOCK_WEB_APP_DIR,
       :extensions => { :foo => {} }
     })
-    
+
     app_context = server.tomcat.host.find_child('/')
     app_context.doc_base.should == 'foo_app_extension'
   end
 
+  it "doesn't create a default keystore when the option SSLCertificateFile is present in the ssl configuration options" do
+    require 'fileutils'
+    FileUtils.rm_rf 'ssl'
+
+    server = Trinidad::Server.new({
+      :ssl => {
+        :port => 8443,
+        :SSLCertificateFile => '/usr/local/ssl/server.crt'
+      },
+      :web_app_dir => MOCK_WEB_APP_DIR})
+
+    File.exist?('ssl').should be_false
+  end
+
   def default_context_should_be_loaded(children)
     children.should have(1).web_apps
     children[0].doc_base.should == MOCK_WEB_APP_DIR

data/spec/trinidad/web_app_lifecycle_listener_spec.rb

@@ -174,6 +174,6 @@ describe Trinidad::WebAppLifecycleListener do
     listener.context = Trinidad::Tomcat::StandardContext.new
     listener.configure_init_params
 
-    listener.context.find_parameter('rackup').should == "require 'rubygems'\nrequire 'sinatra'"
+    listener.context.find_parameter('rackup.path').should == "config.ru"
   end
 end

data/spec/trinidad/web_app_spec.rb

@@ -75,7 +75,7 @@ describe Trinidad::WebApp do
       })
 
       parameters = app.init_params
-      parameters['rackup'].should =~ /run App/
+      parameters['rackup.path'].should == 'config/config.ru'
     end
   end
 
@@ -130,4 +130,46 @@ describe Trinidad::WebApp do
     app = Trinidad::WebApp.create(config, app_config)
     app.extensions[:hotdeploy].should include(:delay)
   end
+
+  it "creates a rackup application when the rackup file is under WEB-INF directory" do
+    FakeFS do
+      create_rackup_file('WEB-INF')
+      app = Trinidad::WebApp.create({}, {})
+
+      app.should be_an_instance_of(Trinidad::RackupWebApp)
+    end
+  end
+
+  it "doesn't add the rackup init parameter when the rackup file is under WEB-INF directory" do
+    FakeFS do
+      create_rackup_file('WEB-INF')
+      app = Trinidad::WebApp.create({}, {})
+
+      app.init_params.should_not include('rackup.path')
+    end
+  end
+
+  it "loads rackup file from a given directory" do
+    FakeFS do
+      create_rackup_file('rack')
+      app = Trinidad::WebApp.create({}, {
+        :web_app_dir => Dir.pwd,
+        :rackup => 'rack'
+      })
+      app.init_params.should include('rackup.path')
+      app.init_params['rackup.path'].should == 'rack/config.ru'
+    end
+  end
+
+  it "allows to configure the servlet from the configuration options" do
+    app = Trinidad::WebApp.create({}, {
+      :servlet => {
+        :class => 'org.jruby.trinidad.FakeServlet',
+        :name => 'FakeServlet'
+      }
+    })
+
+    app.servlet[:class].should == 'org.jruby.trinidad.FakeServlet'
+    app.servlet[:name].should == 'FakeServlet'
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - David Calavera
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-09 00:00:00 +02:00
+date: 2010-05-24 00:00:00 +02:00
 default_executable: trinidad
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,8 +38,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
         - 0
-        version: "0"
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency