trinidad 0.6.0 → 0.7.0

data/History.txt

@@ -1,3 +1,7 @@
+== 0.7.0 (2009-12-01)
+
+* Support to run different applications within the same Tomcat container
+
 == 0.6.0 (2009-11-02)
 
 * Rackup compatibe frameworks support

data/README.rdoc

@@ -33,6 +33,8 @@ The server can also be configured from a yaml file. If a file is not especified,
 
 You can also specify a default web.xml to config your web application. By default the server tries to load the file <em>config/web.xml</em> but you can modify this path adding the option <em>default_web_xml</em> within your configuration file. 
 
+Other <a href="http://wiki.github.com/calavera/trinidad/advanced-configuration">advanced options</a> can be found in the wiki.
+
 == Copyright
 
 Copyright (c) 2009 David Calavera<calavera@apache.org>. See LICENSE for details.

data/Rakefile

@@ -16,6 +16,7 @@ begin
     gem.add_dependency 'rack', '>=1.0'
   end
 
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/lib/trinidad/core_ext.rb

@@ -29,4 +29,19 @@ Hash.class_eval do
       end
     end
   end
-end
+
+  def deep_key?(key)
+    exist = false
+
+    keys.each do |k|
+      if self[k].is_a? Hash
+        exist = self[k].deep_key? key
+        break
+      end
+
+      exist = (k == key)
+    end
+    
+    exist
+  end
+end

data/lib/trinidad/rackup_web_app.rb

@@ -11,7 +11,7 @@ module Trinidad
     end
 
     def rackup_script
-      IO.read(File.join(@config[:web_app_dir], @config[:rackup]))
+      IO.read(File.join(@app[:web_app_dir], @app[:rackup]))
     end
   end
 end

data/lib/trinidad/rails_web_app.rb

@@ -3,7 +3,7 @@ module Trinidad
 
     def add_init_params
       super
-      @context.addParameter('rails.env', @config[:environment].to_s) unless @context.findParameter('rails.env')
+      @context.addParameter('rails.env', environment.to_s) unless @context.findParameter('rails.env')
       @context.addParameter('rails.root', '/') unless @context.findParameter('rails.root')
     end
 

data/lib/trinidad/server.rb

@@ -12,44 +12,52 @@ module Trinidad
         :default_web_xml => 'config/web.xml',
         :port => 3000,
         :jruby_min_runtimes => 1,
-        :jruby_max_runtimes => 5,
-        :ssl => {
-          :keystore => 'ssl/keystore',
-          :keystorePass => 'waduswadus'
-        }
+        :jruby_max_runtimes => 5
       }
     end
     
     def initialize(config = {})
       load_config(config)
       load_tomcat_server
-      create_web_app      
+      create_web_apps
     end
     
     def load_config(config)
-      @config = {:web_app_dir => Dir.pwd}.merge(default_options).deep_merge(config)
-      
-      @config[:ssl][:keystore] = File.join(@config[:web_app_dir], @config[:ssl][:keystore])
+      @config = default_options.deep_merge(config)
+      add_default_web_app!(@config)
+
+      configure_ssl!(@config)      
     end
     
     def load_tomcat_server
       @tomcat = Trinidad::Tomcat::Tomcat.new
       @tomcat.setPort(@config[:port].to_i)
+      @tomcat.setBaseDir(Dir.pwd)
       
       add_ssl_connector if ssl_enabled?
       add_ajp_connector if ajp_enabled?
     end
     
-    def create_web_app
-      web_app = WebApp.create(@tomcat.addWebapp(@config[:context_path].to_s, @config[:web_app_dir]), @config)
+    def create_web_apps
+      @config[:web_apps].each do |name, app|
+        unless app[:context_path]
+          app[:context_path] = name.to_s == 'default' ? '/' : "/#{name.to_s}"
+        end
+        app[:web_app_dir] = Dir.pwd unless app.has_key?(:web_app_dir)
+
+        tomcat_app = @tomcat.addWebapp(app[:context_path].to_s, app[:web_app_dir])
+#        tomcat_app.setDocBase(app[:web_app_dir])        
+
+        web_app = WebApp.create(tomcat_app, @config, app)
 
-      web_app.load_default_web_xml
-      web_app.add_rack_filter
-      web_app.add_context_loader
-      web_app.add_init_params
-      web_app.add_web_dir_resources
+        web_app.load_default_web_xml
+        web_app.add_rack_filter
+        web_app.add_context_loader
+        web_app.add_init_params
+        web_app.add_web_dir_resources
       
-      web_app.add_rack_context_listener
+        web_app.add_rack_context_listener
+      end
     end
     
     def add_service_connector(options, protocol = nil)
@@ -59,7 +67,7 @@ module Trinidad
       
   		connector.scheme = opts.delete(:scheme) if opts[:scheme]
   		connector.secure = opts.delete(:secure) || false
-  		connector.port = opts.delete(:port)
+  		connector.port = opts.delete(:port).to_i
   		
   		options.each do |key, value|
   		  connector.setProperty(key.to_s, value.to_s)
@@ -73,26 +81,28 @@ module Trinidad
     end
     
     def add_ssl_connector
-  		options = @config[:ssl].merge({
-  		  :scheme => 'https', 
-  		  :secure => true,
-  		  :SSLEnabled => 'true',
-  		})
-  		add_service_connector(options)
+      @config[:web_apps].each do |name, app|
+  		  options = app[:ssl].merge({
+  		    :scheme => 'https', 
+  		    :secure => true,
+  		    :SSLEnabled => 'true',
+  	  	})
+  		  add_service_connector(options)
   		
-  		create_default_keystore unless File.exist?(@config[:ssl][:keystore])
+  		  create_default_keystore(app) unless File.exist?(app[:ssl][:keystore])
+      end
     end
     
     def ssl_enabled?
-      !@config[:ssl].nil? && !@config[:ssl][:port].nil? && @config[:ssl][:port].is_a?(Fixnum)
+      @config.has_key?(:ssl) || @config[:web_apps].deep_key?(:ssl)
     end
     
     def ajp_enabled?
-      !@config[:ajp].nil? && !@config[:ajp][:port].nil? && @config[:ajp][:port].is_a?(Fixnum)
+      @config.has_key?(:ajp)
     end
     
-    def create_default_keystore
-      keystore_file = java.io.File.new(@config[:ssl][:keystore])
+    def create_default_keystore(config)
+      keystore_file = java.io.File.new(config[:ssl][:keystore])
       
       if (!keystore_file.parent_file.exists() &&
               !keystore_file.parent_file.mkdir())
@@ -105,9 +115,9 @@ module Trinidad
         "-keyalg", "RSA",
         "-validity", "365", 
         "-storepass", "key", 
-        "-keystore", @config[:ssl][:keystore], 
-        "-storepass", @config[:ssl][:keystorePass],
-        "-keypass", @config[:ssl][:keystorePass]]
+        "-keystore", config[:ssl][:keystore], 
+        "-storepass", config[:ssl][:keystorePass],
+        "-keypass", config[:ssl][:keystorePass]]
               
       Trinidad::Tomcat::KeyTool.main(keytool_args.to_java(:string))
     end
@@ -116,5 +126,40 @@ module Trinidad
       @tomcat.start
       @tomcat.getServer().await
     end
+
+    private
+
+    def add_default_web_app!(config)
+      if (!config.has_key?(:web_apps))
+        default_app = if (config.has_key?(:rackup))
+          {:rackup => config[:rackup]}
+        else
+          {
+            :context_path => config[:context_path] || '/',
+            :web_app_dir => config[:web_app_dir] || Dir.pwd
+          }
+        end
+
+        config.merge!({
+          :web_apps => {
+            :default => default_app
+          }
+        })
+      end
+    end
+
+    def configure_ssl!(config)
+      if config.has_key?(:ssl) || config[:web_apps].deep_key?(:ssl)
+        if (config.has_key?(:ssl))
+          config[:ssl][:keystore] ||= 'ssl/keystore'
+          config[:ssl][:keystorePass] ||= 'waduswadus'
+        end
+
+        config[:web_apps].each do |name, app|
+          app[:ssl] = config[:ssl] unless app.has_key?(:ssl)
+          app[:ssl][:keystore] = File.join(app[:web_app_dir], app[:ssl][:keystore]) if app.has_key?(:ssl)
+        end
+      end
+    end
   end
 end

data/lib/trinidad/web_app.rb

@@ -2,13 +2,14 @@ module Trinidad
   class WebApp
     attr_reader :context, :config
   
-    def self.create(context, config)
-      config.has_key?(:rackup) ? RackupWebApp.new(context, config) : RailsWebApp.new(context, config) 
+    def self.create(context, config, app)
+      app.has_key?(:rackup) ? RackupWebApp.new(context, config, app) : RailsWebApp.new(context, config, app)
     end
     
-    def initialize(context, config)
+    def initialize(context, config, app)
       @context = context
       @config = config
+      @app = app
     end
     
     def add_rack_filter
@@ -17,10 +18,9 @@ module Trinidad
         filter_def.setFilterName('RackFilter')
         filter_def.setFilterClass('org.jruby.rack.RackFilter')
 
-        pattern = @config[:context_path][-1..-1] != '/' ? @config[:context_path] : @config[:context_path][0..-2]
         filter_map = Trinidad::Tomcat::FilterMap.new
         filter_map.setFilterName('RackFilter')
-        filter_map.addURLPattern("#{pattern}/*")
+        filter_map.addURLPattern('/*')
 
         @context.addFilterDef(filter_def)
         @context.addFilterMap(filter_map)
@@ -49,7 +49,7 @@ module Trinidad
     end
     
     def add_web_dir_resources
-      @context.setDocBase(File.join(@config[:web_app_dir], public_root)) if File.exist?(File.join(@config[:web_app_dir], public_root))
+      @context.setDocBase(File.join(@app[:web_app_dir], public_root)) if File.exist?(File.join(@app[:web_app_dir], public_root))
     end
     
     def add_rack_context_listener
@@ -59,7 +59,7 @@ module Trinidad
     end
     
     def add_application_libs(class_loader)
-      resources_dir = File.join(@config[:web_app_dir], @config[:libs_dir], '**', '*.jar')
+      resources_dir = File.join(@app[:web_app_dir], libs_dir, '**', '*.jar')
       
       Dir[resources_dir].each do |resource|
         class_loader.addURL(java.io.File.new(resource).to_url)
@@ -67,12 +67,12 @@ module Trinidad
     end
     
     def add_application_classes(class_loader)
-      resources_dir = File.join(@config[:web_app_dir], @config[:classes_dir])
+      resources_dir = File.join(@app[:web_app_dir], classes_dir)
       class_loader.addURL(java.io.File.new(resources_dir).to_url)
     end
 
     def load_default_web_xml
-      default_web_xml = File.expand_path(File.join(@config[:web_app_dir], @config[:default_web_xml]))
+      default_web_xml = File.expand_path(File.join(@app[:web_app_dir], default_web_xml_file))
       
       if File.exist?(default_web_xml)
         @context.setDefaultWebXml(default_web_xml)
@@ -103,7 +103,23 @@ module Trinidad
     end
 
     def public_root
-      @context.findParameter('public.root') || @config[:public] || 'public'
+      @context.findParameter('public.root') || @app[:public]  || @config[:public] || 'public'
+    end
+
+    def libs_dir
+      @app[:libs_dir] || @config[:libs_dir]
+    end
+
+    def classes_dir
+      @app[:classes_dir] || @config[:classes_dir]
+    end
+
+    def default_web_xml_file
+      @app[:default_web_xml] || @config[:default_web_xml]
+    end
+
+    def environment
+      @app[:environment] || @config[:environment]
     end
   end
 end

data/spec/trinidad/server_spec.rb

@@ -39,4 +39,30 @@ describe Trinidad::Server do
     server.tomcat.service.findConnectors().should have(1).connectors
     server.tomcat.service.findConnectors()[0].protocol.should == 'AJP/1.3'
   end
+
+  it "loads one application for each option present into :web_apps" do
+    server = Trinidad::Server.new({
+      :web_apps => {
+        :mock1 => {
+          :context_path => '/mock1',
+          :web_app_dir => File.join(File.dirname(__FILE__), '..', 'web_app_mock')
+        },
+        :mock2 => {
+          :context_path => '/mock2',
+          :web_app_dir => File.join(File.dirname(__FILE__), '..', 'web_app_mock')
+        }
+      }
+    })
+
+    server.tomcat.host.findChildren().should have(2).web_apps
+    server.tomcat.host.findChildren().each do |child|
+      puts child.getPath()
+    end
+  end
+
+  it "loads the default application from the current directory if :web_apps is not present" do
+    server = Trinidad::Server.new({:web_app_dir => File.join(File.dirname(__FILE__), '..', 'web_app_mock')})
+
+    server.tomcat.host.findChildren().should have(1).web_apps
+  end
 end

data/spec/trinidad/web_app_spec.rb

@@ -4,24 +4,31 @@ describe Trinidad::WebApp do
   before do
     @tomcat = Trinidad::Tomcat::Tomcat.new
     @tomcat_web_app = @tomcat.addWebapp('/', File.dirname(__FILE__) + '/../../')
+    @app = {
+      :web_app_dir => File.join(File.dirname(__FILE__), '..', 'web_app_mock'),
+      :context_path => '/'
+    }
     @config = {
       :libs_dir => 'lib',
       :classes_dir => 'classes',
       :default_web_xml => 'config/web.xml',
-      :web_app_dir => File.join(File.dirname(__FILE__), '..', 'web_app_mock'),
       :jruby_min_runtimes => 2,
       :jruby_max_runtimes => 6,
-      :context_path => '/'
+      :web_apps => {
+        :default => @app
+      }
     }
-    @web_app = Trinidad::RailsWebApp.new(@tomcat_web_app, @config)
+    @web_app = Trinidad::RailsWebApp.new(@tomcat_web_app, @config, @app)
   end
   
   it "creates a RailsWebApp if rackup option is not present" do
-    Trinidad::WebApp.create(@tomcat_web_app, @config).is_a?(Trinidad::RailsWebApp).should be_true
+    Trinidad::WebApp.create(@tomcat_web_app, @config, @app).is_a?(Trinidad::RailsWebApp).should be_true
   end
 
   it "creates a RackupWebApp if rackup option is present" do
-    Trinidad::WebApp.create(@tomcat_web_app, @config.merge(:rackup => 'config.ru')).is_a?(Trinidad::RackupWebApp).should be_true
+    rackup_app = {:rackup => 'config.ru'}
+    @config.deep_merge({:web_apps => {:default => rackup_app}})
+    Trinidad::WebApp.create(@tomcat_web_app, @config, rackup_app).is_a?(Trinidad::RackupWebApp).should be_true
   end
 
   it "should load custom jars" do 

metadata

@@ -67,15 +67,15 @@ requirements: []
 
 authors: 
 - David Calavera
-date: 2009-11-01 23:00:00 +00:00
+date: 2009-11-30 23:00:00 +00:00
 platform: ruby
 test_files: 
 - spec/spec_helper.rb
-- spec/trinidad/command_line_parser_spec.rb
 - spec/trinidad/server_spec.rb
+- spec/trinidad/command_line_parser_spec.rb
 - spec/trinidad/web_app_spec.rb
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.7.0
 require_paths: 
 - lib
 dependencies: