trinidad 0.9.12 → 1.0.0

data/History.txt

@@ -1,3 +1,10 @@
+== 1.0.0 (2010-11-04)
+
+* Warbler support
+* Add APR listener to run under native connectors
+* fixes #24: setting address doesn't affect listening socket
+* fix issues configuring the logger out of the lifecycle listener
+
 == 0.9.12 (2010-10-21)
 
 * fix problems loading tomcat classes from rack application

data/lib/trinidad/command_line_parser.rb

@@ -30,6 +30,8 @@ module Trinidad
       end
 
       if default_options.has_key?(:config)
+        default_options[:config] = File.expand_path(default_options[:config], default_options[:web_app_dir] || Dir.pwd)
+
         config_options = YAML.load_file(default_options[:config])
         default_options.deep_merge!(config_options.symbolize!)
       end

data/lib/trinidad/server.rb

@@ -31,10 +31,10 @@ module Trinidad
 
     def load_tomcat_server
       @tomcat = Trinidad::Tomcat::Tomcat.new
+      @tomcat.base_dir = Dir.pwd
       @tomcat.hostname = @config[:address]
       @tomcat.server.address = @config[:address]
       @tomcat.port = @config[:port].to_i
-      @tomcat.base_dir = Dir.pwd
       @tomcat.host.app_base = @config[:apps_base] || Dir.pwd
       @tomcat.enable_naming
 
@@ -46,6 +46,11 @@ module Trinidad
     end
 
     def create_web_apps
+      create_from_web_apps
+      create_from_apps_base
+    end
+
+    def create_from_web_apps
       if @config[:web_apps]
         @config[:web_apps].each do |name, app_config|
           app_config[:context_path] ||= (name.to_s == 'default' ? '/' : "/#{name.to_s}")
@@ -54,11 +59,17 @@ module Trinidad
           create_web_app(app_config)
         end
       end
+    end
+
+    def create_from_apps_base
       if @config[:apps_base]
-        apps_path = Dir.glob(File.join(@config[:apps_base], '*')).select {|path| !(path =~ /tomcat\.8080$/) }
+        apps_path = Dir.glob(File.join(@config[:apps_base], '*')).
+          select {|path| !(path =~ /tomcat\.\d+$/) }
+
+        apps_path.reject! {|path| apps_path.include?(path + '.war') }
 
         apps_path.each do |path|
-          if File.directory?(path)
+          if (File.directory?(path) || path =~ /\.war$/)
             name = File.basename(path)
             app_config = {
               :context_path => (name == 'default' ? '/' : "/#{name.to_s}"),
@@ -72,19 +83,19 @@ module Trinidad
     end
 
     def create_web_app(app_config)
-        app_context = @tomcat.addWebapp(app_config[:context_path], app_config[:web_app_dir])
-        remove_defaults(app_context)
+      web_app = WebApp.create(@config, app_config)
+
+      app_context = @tomcat.addWebapp(web_app.context_path, web_app.web_app_dir)
+      app_context.work_dir = web_app.work_dir
 
-        web_app = WebApp.create(@config, app_config)
-        configure_logging(web_app)
+      Trinidad::Extensions.configure_webapp_extensions(web_app.extensions, @tomcat, app_context)
 
-        Trinidad::Extensions.configure_webapp_extensions(web_app.extensions, @tomcat, app_context)
-        app_context.add_lifecycle_listener(WebAppLifecycleListener.new(web_app))
+      lifecycle = web_app.war? ? Lifecycle::War.new(web_app) : Lifecycle::Default.new(web_app)
+      app_context.add_lifecycle_listener(lifecycle)
     end
 
     def add_service_connector(options, protocol = nil)
       connector = Trinidad::Tomcat::Connector.new(protocol)
-
       opts = options.dup
 
       connector.scheme = opts.delete(:scheme) if opts[:scheme]
@@ -124,11 +135,16 @@ module Trinidad
     end
 
     def add_http_connector
-      options = @config[:http]
+      options = @config[:http] || {}
+      options[:address] ||= @config[:address] if @config[:address] != 'localhost'
       options[:port] = @config[:port]
       options[:protocol_handler] = 'org.apache.coyote.http11.Http11NioProtocol' if options[:nio]
 
-      connector = add_service_connector(options, options[:protocol_handler])
+      if options[:apr]
+        @tomcat.server.add_lifecycle_listener(Trinidad::Tomcat::AprLifecycleListener.new)
+      end
+
+      connector = add_service_connector(options, options[:protocol_handler] || 'HTTP/1.1')
       @tomcat.connector = connector
     end
 
@@ -141,7 +157,7 @@ module Trinidad
     end
 
     def http_configured?
-      @config.has_key?(:http)
+      @config.has_key?(:http) || @config[:address] != 'localhost'
     end
 
     def create_default_keystore(config)
@@ -184,51 +200,5 @@ module Trinidad
         config[:web_apps] = { :default => default_app }
       end
     end
-
-    def remove_defaults(app_context)
-      default_servlet = app_context.find_child('default')
-      app_context.remove_child(default_servlet) if default_servlet
-
-      jsp_servlet = app_context.find_child('jsp')
-      app_context.remove_child(jsp_servlet) if jsp_servlet
-
-      app_context.remove_servlet_mapping('/')
-      app_context.remove_servlet_mapping('*.jspx')
-      app_context.remove_servlet_mapping('*.jsp')
-
-      app_context.process_tlds = false
-    end
-
-    def configure_logging(web_app)
-      log_path = File.join(web_app.web_app_dir, 'log', "#{web_app.environment}.log")
-      log_file = java.io.File.new(log_path)
-
-      unless log_file.exists
-        log_file.parent_file.mkdirs
-        log_file.create_new_file
-      end
-
-      jlogging = java.util.logging
-
-      log_handler = jlogging.FileHandler.new(log_path, true)
-      logger = jlogging.Logger.get_logger("")
-
-      log_level = web_app.log
-      unless %w{ALL CONFIG FINE FINER FINEST INFO OFF SEVERE WARNING}.include?(log_level)
-        puts "Invalid log level #{log_level}, using default: INFO"
-        log_level = 'INFO'
-      end
-
-      level = jlogging.Level.parse(log_level)
-
-      logger.handlers.each do |handler|
-        handler.level = level
-      end
-
-      logger.level = level
-
-      log_handler.formatter = jlogging.SimpleFormatter.new
-      logger.add_handler(log_handler)
-    end
   end
 end

data/lib/trinidad/war_web_app.rb

@@ -0,0 +1,11 @@
+module Trinidad
+  class WarWebApp < WebApp
+    def context_path
+      super.gsub(/\.war$/, '')
+    end
+
+    def work_dir
+      File.join(web_app_dir.gsub(/\.war$/, ''), 'WEB-INF')
+    end
+  end
+end

data/lib/trinidad/web_app.rb

@@ -3,7 +3,16 @@ module Trinidad
     attr_reader :config, :app_config, :class_loader, :servlet
 
     def self.create(config, app_config)
-      rackup?(app_config) ? RackupWebApp.new(config, app_config) : RailsWebApp.new(config, app_config)
+      war?(app_config) ? WarWebApp.new(config, app_config) :
+        rackup?(app_config) ? RackupWebApp.new(config, app_config) : RailsWebApp.new(config, app_config)
+    end
+
+    def self.rackup?(app_config)
+      app_config.has_key?(:rackup) || !Dir['WEB-INF/**/config.ru'].empty?
+    end
+
+    def self.war?(app_config)
+      app_config[:context_path] =~ /\.war$/
     end
 
     def initialize(config, app_config, servlet_class = 'org.jruby.rack.RackServlet', servlet_name = 'RackServlet')
@@ -30,7 +39,7 @@ module Trinidad
 
     def default_deployment_descriptor
       @deployment_descriptor ||= if default_web_xml
-        file = File.expand_path(File.join(web_app_dir, default_web_xml))
+        file = File.expand_path(File.join(work_dir, default_web_xml))
         File.exist?(file) ? file : nil
       end
     end
@@ -53,7 +62,7 @@ module Trinidad
       @app_config[:public]  || @config[:public] || 'public'
     end
 
-    %w{web_app_dir libs_dir classes_dir default_web_xml environment
+    %w{context_path web_app_dir libs_dir classes_dir default_web_xml environment
         jruby_min_runtimes jruby_max_runtimes rackup log}.each do |method_name|
       define_method method_name do
         sym = method_name.to_sym
@@ -69,6 +78,9 @@ module Trinidad
       end
     end
 
+    def war?; WebApp.war?(app_config); end
+    def work_dir; web_app_dir; end
+
     protected
     def add_parameter_unless_exist(param_name, param_value)
       @params[param_name] = param_value unless web_context_param(param_name)
@@ -80,7 +92,7 @@ module Trinidad
       @web_xml ||=
         begin
           require 'rexml/document'
-          REXML::Document.new( File.read(default_deployment_descriptor) )
+          REXML::Document.new(File.read(default_deployment_descriptor))
         rescue REXML::ParseException => e
           puts "WARNING: invalid deployment descriptor:[#{default_deployment_descriptor}]"
           puts e.message
@@ -102,9 +114,5 @@ module Trinidad
       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/lib/trinidad.rb

@@ -15,12 +15,14 @@ require 'trinidad/extensions'
 require 'trinidad/command_line_parser'
 require 'trinidad/jars'
 require 'trinidad/server'
-require 'trinidad/web_app_lifecycle_listener'
+require 'trinidad/lifecycle/lifecycle_listener_base'
+require 'trinidad/lifecycle/lifecycle_listener_default'
+require 'trinidad/lifecycle/lifecycle_listener_war'
 require 'trinidad/web_app'
 require 'trinidad/rails_web_app'
 require 'trinidad/rackup_web_app'
-
+require 'trinidad/war_web_app'
 
 module Trinidad
-  VERSION = '0.9.12'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,151 +1,136 @@
 --- !ruby/object:Gem::Specification 
 name: trinidad
 version: !ruby/object:Gem::Version 
-  hash: 35
   prerelease: false
   segments: 
-  - 0
-  - 9
-  - 12
-  version: 0.9.12
+    - 1
+    - 0
+    - 0
+  version: 1.0.0
 platform: ruby
 authors: 
-- David Calavera
+  - David Calavera
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-10-22 00:00:00 +02:00
+date: 2010-11-04 00:00:00 -07:00
 default_executable: trinidad
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: trinidad_jars
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: jruby-rack
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: fakefs
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: trinidad_jars
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 3
+              - 0
+            version: 0.3.0
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: jruby-rack
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 0
+              - 2
+            version: 1.0.2
+    type: :runtime
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+            version: "0"
+    type: :development
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: mocha
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+            version: "0"
+    type: :development
+    version_requirements: *id004
+  - !ruby/object:Gem::Dependency 
+    name: fakefs
+    prerelease: false
+    requirement: &id005 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+            version: "0"
+    type: :development
+    version_requirements: *id005
 description: Trinidad allows you to run a rails or rackup applications within an embedded Apache Tomcat container
 email: calavera@apache.org
 executables: 
-- trinidad
+  - trinidad
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
-- LICENSE
+  - README.rdoc
+  - LICENSE
 files: 
-- bin/trinidad
-- lib/trinidad.rb
-- History.txt
-- LICENSE
-- README.rdoc
-- lib/trinidad/command_line_parser.rb
-- lib/trinidad/core_ext.rb
-- lib/trinidad/extensions.rb
-- lib/trinidad/rackup_web_app.rb
-- lib/trinidad/rails_web_app.rb
-- lib/trinidad/server.rb
-- lib/trinidad/web_app.rb
-- lib/trinidad/web_app_lifecycle_listener.rb
+  - bin/trinidad
+  - lib/trinidad.rb
+  - History.txt
+  - LICENSE
+  - README.rdoc
+  - lib/trinidad/command_line_parser.rb
+  - lib/trinidad/core_ext.rb
+  - lib/trinidad/extensions.rb
+  - lib/trinidad/rackup_web_app.rb
+  - lib/trinidad/rails_web_app.rb
+  - lib/trinidad/server.rb
+  - lib/trinidad/war_web_app.rb
+  - lib/trinidad/web_app.rb
 has_rdoc: true
 homepage: http://github.com/calavera/trinidad
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset=UTF-8
+  - --charset=UTF-8
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: trinidad
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: Simple library to run rails applications into an embedded Tomcat

data/lib/trinidad/web_app_lifecycle_listener.rb

@@ -1,88 +0,0 @@
-module Trinidad
-  class WebAppLifecycleListener
-    include Trinidad::Tomcat::LifecycleListener
-
-    attr_reader :context
-
-    def initialize(webapp)
-      @webapp = webapp
-    end
-
-    def lifecycleEvent(event)
-      if Trinidad::Tomcat::Lifecycle::BEFORE_START_EVENT == event.type
-        init_defaults(event.lifecycle)
-      end
-    end
-
-    def init_defaults(context)
-      @context = context
-
-      deployment_descriptor = configure_deployment_descriptor
-      unless deployment_descriptor
-        configure_rack_servlet
-        configure_rack_listener
-      end
-      configure_init_params
-      configure_context_loader
-    end
-
-    def configure_deployment_descriptor
-      if descriptor = @webapp.default_deployment_descriptor
-        @context.setDefaultWebXml(descriptor)
-
-        context_config = Trinidad::Tomcat::ContextConfig.new
-        context_config.setDefaultWebXml(descriptor)
-
-        @context.addLifecycleListener(context_config)
-      end
-      descriptor
-    end
-
-    def configure_rack_servlet
-      wrapper = @context.create_wrapper
-      wrapper.servlet_class = @webapp.servlet[:class]
-      wrapper.name = @webapp.servlet[:name]
-
-      @context.add_child(wrapper)
-      @context.add_servlet_mapping('/*', wrapper.name)
-    end
-
-    def configure_rack_listener
-      @context.addApplicationListener(@webapp.rack_listener)
-    end
-
-    def configure_init_params
-      @webapp.init_params.each do |name, value|
-        @context.addParameter(name, value)
-      end
-    end
-
-    def configure_context_loader
-      class_loader = @webapp.class_loader
-
-      add_application_jars(class_loader)
-      add_application_java_classes(class_loader)
-
-      loader = Trinidad::Tomcat::WebappLoader.new(class_loader)
-      loader.container = @context
-      @context.loader = loader
-    end
-
-    def add_application_jars(class_loader)
-      return unless @webapp.libs_dir
-
-      resources_dir = File.join(@webapp.web_app_dir, @webapp.libs_dir, '**', '*.jar')
-
-      Dir[resources_dir].each do |resource|
-        class_loader.addURL(java.io.File.new(resource).to_url)
-      end
-    end
-
-    def add_application_java_classes(class_loader)
-      return unless @webapp.classes_dir
-
-      resources_dir = File.join(@webapp.web_app_dir, @webapp.classes_dir)
-      class_loader.addURL(java.io.File.new(resources_dir).to_url)
-    end
-  end
-end