trinidad 1.4.5 → 1.4.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4324c8a8dacc58bba855257ddfc1296159002490
+  data.tar.gz: 4bbedc68ed6ac2515163b9a43d200f1f61de181d
+SHA512:
+  metadata.gz: 34e0a3221d65521854cd6dc9d51b05b3b22ec1591f920f130ea15da93d4a1903b598826567921d390224d424a6542d54e45785a335661a4f2ffa80496b766386
+  data.tar.gz: 79466df8eb49615db97e4381d7b185501001edce145d6eb122366444380da3073bcb6dcdff8ebd2103cef46824f3b3fd18ba18f8bb682f97e5eaeb101bc99561

data/Gemfile

@@ -16,7 +16,7 @@ end
 gem 'sinatra', :require => nil, :group => :test
 
 group :integration do
-  gem "rails", "~> 3.2.11"
-  gem "jruby-openssl"
-  #eval(File.read("spec/integration/rails32/Gemfile"), binding)
+  gem "rails", "~> 3.2.16"
+  gem "jruby-openssl" if JRUBY_VERSION < '1.7.0'
+  # eval(File.read("spec/integration/rails32/Gemfile"), binding)
 end

data/History.md

@@ -1,3 +1,28 @@
+## trinidad 1.4.6 (2013-12-28)
+
+* default :port for SSL is now (a more Ruby-sh) 3443
+* better handling of port/address for connectors when only one configured
+  e.g. in case users want https:// but not http://
+* make sure we keep localhost for tomcat.server's address if not specified
+* only generate 'dummy' SSL keystore if not done already (#117)
+* getting more "strict" about jruby-rack and trinidad_jars gem versions
+* use a custom context manager to have "truly" lazy (java) sessions (#123)
+* improve thread-safe rails (4.0) auto-detection from environment files
+* allow symlinks in assets FS e.g. public/assets might be linked (#120)
+* do not default to 'localhost' (default host) but use :address as name (#119)
+
+with (latest) JRuby-Rack 1.1.13 works on JRuby 1.6.x (even < 1.6.7) as well
+
+## trinidad_jars 1.3.0 (2013-12-28)
+
+* Tomcat 7.0.47 http://tomcat.apache.org/tomcat-7.0-doc/changelog.html
+* re-invent the MessageFormatter in Java
+* introduce Jerry - Tomcat's little companion
+
+## trinidad_jars 1.2.5 (2013-11-14)
+
+* Tomcat 7.0.42 http://tomcat.apache.org/tomcat-7.0-doc/changelog.html
+
 ## trinidad 1.4.5 (2013-06-14)
 
 * server should set up AJP only (if HTTP not explicitly configured) (#113)

data/LICENSE

@@ -1,6 +1,6 @@
 == Trinidad
 
-Copyright (c) 2012 Team Trinidad and contributors http://github.com/trinidad
+Copyright (c) 2013 Team Trinidad and contributors http://github.com/trinidad
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -23,6 +23,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 == Tomcat
 
-Apache Tomcat (Copyright 1999-2012 The Apache Software Foundation) 
+Apache Tomcat (Copyright 1999-2013 The Apache Software Foundation)
 is licensed under the Apache License, Version 2.0.
 See http://www.apache.org/licenses/LICENSE-2.0 for details.

data/lib/trinidad/command_line_parser.rb

@@ -8,9 +8,9 @@ module Trinidad
     def self.load(options = {})
       CommandLineParser.new.load!(options)
     end
-    
+
     attr_reader :default_options
-    
+
     def initialize
       @default_options = {}
     end
@@ -46,7 +46,7 @@ module Trinidad
     alias_method :load_configuration, :load!
 
     DEFAULT_CONFIG_FILE = 'config/trinidad.{yml,rb}'
-    
+
     def config_file(base_dir = nil)
       base_dir ||= Dir.pwd
       if @config_file.nil? # false means do not use no config file
@@ -55,9 +55,9 @@ module Trinidad
         @config_file && File.expand_path(@config_file, base_dir)
       end
     end
-    
+
     attr_writer :config_file
-    
+
     def options_parser
       require 'optparse'
       @parser ||= OptionParser.new do |opts|
@@ -69,61 +69,61 @@ module Trinidad
           default_options[:root_dir] = dir
         end
 
-        opts.on('-e', '--env ENVIRONMENT', 'rack (rails) environment', 
+        opts.on('-e', '--env ENVIRONMENT', 'rack (rails) environment',
           "default: #{default(:environment)}") do |env|
           default_options[:environment] = env
         end
-        
+
         opts.on('-r', '--rackup [RACKUP_FILE]', 'rackup configuration file',
           "default: config.ru") do |rackup|
           default_options[:rackup] = rackup || 'config.ru'
         end
 
-        opts.on('--public', '--public PUBLIC_DIR', 'web application public root', 
+        opts.on('--public', '--public PUBLIC_DIR', 'web application public root',
           "default: #{default(:public)}") do |public|
           default_options[:public] = public
         end
-        
+
         opts.on('-c', '--context CONTEXT_PATH', 'application context path',
           "default: #{default(:context_path)}") do |path|
           default_options[:context_path] = path
         end
-        
-        opts.on('--monitor', '--monitor MONITOR_FILE', 'monitor for application re-deploys', 
+
+        opts.on('--monitor', '--monitor MONITOR_FILE', 'monitor for application re-deploys',
           "default: tmp/restart.txt") do |monitor|
           default_options[:monitor] = monitor
         end
-        
+
         opts.on('-t', '--threadsafe', 'force thread-safe mode (use single runtime)') do
           default_options[:jruby_min_runtimes] = 1
           default_options[:jruby_max_runtimes] = 1
         end
-        
-        opts.on('--runtimes MIN:MAX', 'use given number of min/max jruby runtimes', 
-          "default: #{default(:jruby_min_runtimes)}:#{default(:jruby_max_runtimes)}") do 
+
+        opts.on('--runtimes MIN:MAX', 'use given number of min/max jruby runtimes',
+          "default: #{default(:jruby_min_runtimes)}:#{default(:jruby_max_runtimes)}") do
           |min_max| min, max = min_max.split(':')
           default_options[:jruby_min_runtimes] = min.to_i if min
           default_options[:jruby_max_runtimes] = max.to_i if max
         end
-        
+
         opts.on('-f', '--config [CONFIG_FILE]', 'configuration file',
           "default: #{DEFAULT_CONFIG_FILE}") do |file|
           self.config_file = file
         end
-        
-        opts.on('--address', '--address ADDRESS', 'host address', 
+
+        opts.on('--address', '--address ADDRESS', 'host address',
           "default: #{default(:address)}") do |address|
           default_options[:address] = address
         end
-        
-        opts.on('-p', '--port PORT', 'port to bind to', 
-          "default: #{default(:port)}") do |port| 
+
+        opts.on('-p', '--port PORT', 'port to bind to',
+          "default: #{default(:port)}") do |port|
           default_options[:port] = port
         end
 
         opts.on('-s', '--ssl [SSL_PORT]', 'enable secure socket layout',
-          "default port: 8443") do |port|
-          default_options[:ssl] = { :port => (port || 8443).to_i }
+          "default port: 3443") do |port|
+          default_options[:ssl] = { :port => (port || 3443).to_i }
         end
 
         opts.on('-a', '--ajp [AJP_PORT]', 'enable the AJP web protocol',
@@ -131,13 +131,13 @@ module Trinidad
           default_options[:ajp] = { :port => (port || 8009).to_i }
         end
 
-        opts.on('--java_lib LIB_DIR', '--lib LIB_DIR (deprecated use --java_lib)', 
+        opts.on('--java_lib LIB_DIR', '--lib LIB_DIR (deprecated use --java_lib)',
           'contains .jar files used by the app',
           "default: #{default(:java_lib)}") do |lib|
           default_options[:java_lib] = lib
         end
 
-        opts.on('--java_classes CLASSES_DIR', '--classes CLASSES_DIR (deprecated use --java_classes)', 
+        opts.on('--java_classes CLASSES_DIR', '--classes CLASSES_DIR (deprecated use --java_classes)',
           'contains java classes used by the app',
           "default: #{default_java_classes}") do |classes|
           default_options[:java_classes] = classes
@@ -149,37 +149,37 @@ module Trinidad
           end
         end
 
-        opts.on('--apps_base APPS_BASE_DIR', '--apps APPS_BASE_DIR (deprecated use --apps_base)', 
+        opts.on('--apps_base APPS_BASE_DIR', '--apps APPS_BASE_DIR (deprecated use --apps_base)',
           'set applications base directory') do |apps_base|
           default_options[:apps_base] = apps_base
         end
-        
+
         opts.on('-g', '--log LEVEL', 'set logging level') do |log|
           default_options[:log] = log
         end
-        
+
         opts.on('-v', '--version', 'show server version') do
           puts "Trinidad #{Trinidad::VERSION} (Tomcat #{Trinidad::TOMCAT_VERSION})"
           exit
         end
-        
+
         opts.on('-h', '--help', 'display this help') do
           puts opts
           exit
         end
       end
     end
-    
+
     private
-    
+
     def default(key)
       default_options[key] || Configuration::DEFAULTS[key]
     end
-    
+
     def default_java_classes
-      default(:java_classes) || 
+      default(:java_classes) ||
         ( default(:java_lib) && File.join(default(:java_lib), 'classes') )
     end
-    
+
   end
 end

data/lib/trinidad/configuration.rb

@@ -3,7 +3,7 @@ module Trinidad
     attr_accessor :configuration
   end
 
-  # Creates a new global configuration (unless already exists) and 
+  # Creates a new global configuration (unless already exists) and
   # (deep) merges the current values using the provided options.
   def self.configure(*args)
     config = ( self.configuration ||= Configuration.new )
@@ -16,7 +16,7 @@ module Trinidad
       end
       config.update!(options)
     end
-    
+
     yield config if block_given?
     config
   end
@@ -26,34 +26,34 @@ module Trinidad
     self.configuration = Configuration.new
     configure(*args, &block)
   end
-  
+
   # Trinidad's (global) configuration instance.
-  # Use Trinidad#configure to update and obtain the global instance or access 
+  # Use Trinidad#configure to update and obtain the global instance or access
   # the instance using Trinidad#configuration
   class Configuration
-    
+
     DEFAULTS = {
-      :port => 3000,
+      # :port => 3000, HTTP (depends on connector used)
       :address => 'localhost',
       :environment => 'development',
       :context_path => '/',
       :public => 'public',
       :java_lib => 'lib/java',
       :default_web_xml => 'config/web.xml',
-      :jruby_min_runtimes => 
+      :jruby_min_runtimes =>
         java.lang.System.getProperty('jruby.min.runtimes') || 1,
-      :jruby_max_runtimes => 
+      :jruby_max_runtimes =>
         java.lang.System.getProperty('jruby.max.runtimes') || 5,
       :log => 'INFO',
       :trap => true
     }
-    
+
     def initialize(options = {})
       @config = DEFAULTS.clone
       update!(options)
     end
 
-    def [](name) 
+    def [](name)
       @config[name.to_sym]
     end
 
@@ -65,37 +65,37 @@ module Trinidad
       @config.has_key?(name.to_sym)
     end
     alias_method :key?, :has_key?
-    
+
     def keys
       @config.keys
     end
-    
+
     def each(&block)
       @config.each(&block)
     end
-    
+
     def update!(options)
       options.each do |key, value|
         self[key] = value.respond_to?(:strip) ? value.strip : value
       end
     end
-    
+
     %w{ port address environment context_path
         java_lib libs_dir java_classes classes_dir default_web_xml
         jruby_min_runtimes jruby_max_runtimes jruby_compat_version
         rackup servlet rack_servlet default_servlet public hosts
-        http ajp ssl extensions
+        http ajp ssl https extensions
         apps_base web_apps web_app_dir
         monitor reload_strategy log trap }.each do |method|
       class_eval "def #{method}; self[:'#{method}']; end"
       class_eval "def #{method}=(value); self[:'#{method}'] = value; end"
     end
     # TODO #deprecate libs_dir classes_dir servlet
-    
+
     # a Hash like #symbolize helper
     def self.symbolize_options(options, deep = true)
       new_options = options.class.new
-      options.each do |key, value|    
+      options.each do |key, value|
         if deep && value.is_a?(Array) # YAML::Omap is an Array
           array = new_options[key.to_sym] = value.class.new
           value.each do |v|
@@ -109,13 +109,13 @@ module Trinidad
       end
       new_options
     end
-    
+
     # a Hash like deep_merge helper
     def self.merge_options(target, current, deep = true)
       return target unless current
       target_dup = target.dup
       current.keys.each do |key|
-        target_dup[key] = 
+        target_dup[key] =
           if deep && options_like?(target[key]) && options_like?(current[key])
             merge_options(target[key], current[key], deep)
           else
@@ -124,12 +124,12 @@ module Trinidad
       end
       target_dup
     end
-    
+
     private
     def self.options_like?(object)
-      object.is_a?(Hash) || 
+      object.is_a?(Hash) ||
         ( object.respond_to?(:keys) && object.respond_to?(:'[]') )
     end
-    
+
   end
 end

data/lib/trinidad/lifecycle/web_app/shared.rb

@@ -1,7 +1,7 @@
 module Trinidad
   module Lifecycle
     module WebApp
-      # Shared web application lifecycle hook, 
+      # Shared web application lifecycle hook,
       # does #configure before the context starts.
       module Shared
 
@@ -23,7 +23,7 @@ module Trinidad
           super
           configure(event.lifecycle)
         end
-        
+
         # Configure the web application before it's started.
         def configure(context)
           adjust_context(context)
@@ -34,7 +34,7 @@ module Trinidad
         end
 
         protected
-        
+
         def adjust_context(context)
           context_name = web_app.context_name
           # on (rolling) reloads the name may have been set already :
@@ -45,7 +45,8 @@ module Trinidad
           context.doc_base = web_app.doc_base if web_app.doc_base
           context.work_dir = web_app.work_dir if web_app.work_dir
           context.aliases  = web_app.aliases  if web_app.aliases
-          
+          context.allow_linking = web_app.allow_linking
+
           context.caching_allowed = web_app.caching_allowed?
           context.cache_ttl = web_app.cache_ttl if web_app.cache_ttl
           if max_size = web_app.cache_max_size
@@ -54,26 +55,30 @@ module Trinidad
           if object_max_size = web_app.cache_object_max_size
             context.cache_object_max_size = object_max_size
           end
+
+          if manager = web_app.context_manager
+            context.manager = manager # replace "standard" (session) manager
+          end
         end
-        
+
         def configure_default_servlet(context)
-          configure_builtin_servlet(context, 
+          configure_builtin_servlet(context,
             web_app.default_servlet, Trinidad::WebApp::DEFAULT_SERVLET_NAME
           )
         end
-        
+
         def configure_jsp_servlet(context)
-          wrapper = configure_builtin_servlet(context, 
+          wrapper = configure_builtin_servlet(context,
             web_app.jsp_servlet, Trinidad::WebApp::JSP_SERVLET_NAME
           )
           context.process_tlds = false if wrapper == false # jsp servlet removed
           wrapper
         end
-        
+
         def configure_logging(context)
           Trinidad::Logging.configure_web_app(web_app, context)
         end
-        
+
         private
 
         def configure_builtin_servlet(context, servlet_config, name)
@@ -98,7 +103,7 @@ module Trinidad
               wrapper.servlet_class = servlet_class
             end
             # do not remove wrapper but only "update" the default :
-            wrapper.load_on_startup = ( servlet_config[:load_on_startup] || 
+            wrapper.load_on_startup = ( servlet_config[:load_on_startup] ||
                 name_wrapper.load_on_startup ).to_i
             add_init_params(wrapper, servlet_config[:init_params])
             if mapping = servlet_config[:mapping]
@@ -110,13 +115,13 @@ module Trinidad
             wrapper
           end
         end
-        
+
         def remove_defaults(context)
           context.remove_welcome_file('index.htm')
           context.remove_welcome_file('index.html')
           context.remove_welcome_file('index.jsp')
         end
-        
+
         def add_init_params(wrapper, params)
           return unless params
           params.each do |param, value|
@@ -124,22 +129,22 @@ module Trinidad
             wrapper.add_init_parameter(param.to_s, val)
           end
         end
-        
+
         def add_servlet_mapping(context, mapping, name)
-          if mapping.is_a?(String) || mapping.is_a?(Symbol) 
+          if mapping.is_a?(String) || mapping.is_a?(Symbol)
             context.add_servlet_mapping(mapping.to_s, name)
           else
             mapping.each { |m| add_servlet_mapping(context, m, name) }
           end
         end
-        
+
         # Remove all servlet mappings for given (servlet) name.
         def remove_servlet_mapping(context, name)
           find_servlet_mapping(context, name).each do
             |pattern| context.remove_servlet_mapping(pattern)
           end
         end
-        
+
         # Find all servlet mappings for given (servlet) name.
         def find_servlet_mapping(context, name)
           name_mapping = []
@@ -149,12 +154,12 @@ module Trinidad
           end
           name_mapping
         end
-        
+
         def logger
           @logger ||= Trinidad::Logging::LogFactory.
             getLog('org.apache.catalina.core.StandardContext')
         end
-        
+
       end
     end
   end

data/lib/trinidad/lifecycle/web_app/war.rb

@@ -6,7 +6,7 @@ module Trinidad
     module WebApp
       class War < Base
         include Shared
-        
+
         def before_init(event)
           # NOTE: esp. important for .war applications that the name matches the path
           # to work-around ProxyDirContext constructor's `contextPath = contextName;`
@@ -15,21 +15,21 @@ module Trinidad
           context.name = context.path if context.name
           super
         end
-        
+
         def configure(context)
           super # Shared#configure
           configure_class_loader(context)
         end
-        
+
         protected
-        
+
         def adjust_context(context)
           name = context.name
           super
         ensure # @see {#before_init}
           context.name = name
-          # NOTE: mimics HostConfig#deploWAR and should be removed
-          # once Lifecycle::Host inherits func from HostConfig ...
+          # NOTE: mimics HostConfig#deployWAR and might/should be removed
+          # once Lifecycle::Host inherits functionality from HostConfig ...
           # context_name = Trinidad::Tomcat::ContextName.new(name)
           # context.setName context_name.getName()
           # context.setPath context_name.getPath()
@@ -47,7 +47,7 @@ module Trinidad
         def remove_defaults(context = nil)
           # NOTE: do not remove defaults (welcome files)
         end
-        
+
       end
     end
     War = Trinidad::Lifecycle::WebApp::War # backwards compatibility

data/lib/trinidad/logging.rb

@@ -188,30 +188,7 @@ module Trinidad
     end
 
     # A message formatter only prints the log message (and the thrown value).
-    class MessageFormatter < JUL::Formatter # :nodoc:
-
-      def format(record)
-        msg = formatMessage(record)
-        msg << formatThrown(record).to_s
-        # since we're going to print Rails.logger logs and they tend
-        # to already have the ending "\n" handle such cases nicely :
-        if context_name(record.getLoggerName)
-          (lns = LINE_SEP) == msg[-1, 1] ? msg : msg << lns
-        else
-          msg << LINE_SEP
-        end
-      end
-
-      # e.g. org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/foo]
-      # or org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[default]
-      WEB_APP_LOGGER_NAME = /^org\.apache\.catalina\.core\.ContainerBase.*?\[(.*?)\]$/
-
-      private
-      def context_name(name)
-        ( match = (name || '').match(WEB_APP_LOGGER_NAME) ) && match[1]
-      end
-
-    end
+    MessageFormatter = Java::RbTrinidadLogging::MessageFormatter
 
     DefaultFormatter = Java::RbTrinidadLogging::DefaultFormatter
 

data/lib/trinidad/server.rb

@@ -10,7 +10,7 @@ module Trinidad
     end
 
     def configure(config = Trinidad.configuration)
-      configure_logging config[:log]
+      configure_logging config[:logging] || config[:log]
       @config = config.freeze
     end
      # @deprecated replaced with {#configure}
@@ -39,11 +39,14 @@ module Trinidad
 
     def ssl_enabled?
       if ! defined?(@ssl_enabled) || @ssl_enabled.nil?
-        @ssl_enabled = ( !! @config[:ssl] && ! @config[:ssl].empty? )
+        ssl = @config.key?(:https) ? @config[:https] : @config[:ssl]
+        @ssl_enabled = ( !! ssl && ( ! ssl.respond_to?(:empty?) || ! ssl.empty? ) )
       end
       @ssl_enabled
     end
     attr_writer :ssl_enabled
+    alias_method :https_enabled?, :ssl_enabled?
+    alias_method :https_enabled=, :ssl_enabled=
 
     def ajp_enabled?
       if ! defined?(@ajp_enabled) || @ajp_enabled.nil?
@@ -61,37 +64,49 @@ module Trinidad
       end
       @http_configured
     end
-    attr_writer :http_configured
+    # @deprecated
+    def http_configured=(flag); @http_configured = flag end
 
     def tomcat; @tomcat ||= initialize_tomcat; end
 
-    LOCALHOST = 'localhost'.freeze # :nodoc:
-
     def initialize_tomcat
       set_system_properties
 
-      tomcat = Trinidad::Tomcat::Tomcat.new
+      tomcat = Tomcat.new # @see Trinidad::Tomcat
       tomcat.base_dir = config[:base_dir] || Dir.pwd
-      tomcat.hostname = config[:address] || LOCALHOST
-      tomcat.server.address = config[:address]
-      tomcat.port = config[:port].to_i
+      address = config[:address] if config.key?(:address)
+      tomcat.hostname = address || 'localhost'
+      tomcat.server.address = address || nil unless address.nil?
+      tomcat.port = config[:port].to_i if config.key?(:port)
       default_host(tomcat)
       create_hosts(tomcat)
       tomcat.enable_naming
 
-      http_connector = http_configured? ||
-        ( ! ajp_enabled? && config[:address] && config[:address] != LOCALHOST )
+      http_connector = http_configured? || ( ! ajp_enabled? && ! ssl_enabled? )
+
+      tomcat.connector = add_http_connector(config[:http], tomcat) if http_connector
 
-      if http_connector
-        tomcat.connector = add_http_connector(tomcat)
+      if ssl_enabled?
+        options = config.key?(:https) ? config[:https] : config[:ssl]
+        options = {} if options == true
+        unless options.key?(:port)
+          options[:port] = http_connector ? 3443 : config[:port] || 3443
+        end
+        connector = add_ssl_connector(options, tomcat)
+        tomcat.connector = connector unless http_connector
+        http_connector = true # tomcat.connector http: or https: or ajp:
       end
+
       if ajp_enabled?
-        connector = add_ajp_connector(tomcat)
+        options = config[:ajp]; options = {} if options == true
+        unless options.key?(:port)
+          options[:port] = config[:port] || 8009 unless http_connector
+        end
+        connector = add_ajp_connector(options, tomcat)
         tomcat.connector = connector unless http_connector
       end
-      add_ssl_connector(tomcat) if ssl_enabled?
 
-      Trinidad::Extensions.configure_server_extensions(config[:extensions], tomcat)
+      Extensions.configure_server_extensions(config[:extensions], tomcat)
     end
     protected :initialize_tomcat
     # #deprecated renamed to {#initialize_tomcat}
@@ -99,65 +114,99 @@ module Trinidad
 
     def add_host_monitor(app_holders)
       for host in tomcat.engine.find_children
-        host_apps = select_host_apps(app_holders, host)
-        host.add_lifecycle_listener(Trinidad::Lifecycle::Host.new(self, *host_apps))
+        host_apps = select_host_apps(app_holders, host, tomcat)
+        host.add_lifecycle_listener(Lifecycle::Host.new(self, *host_apps))
       end
     end
     protected :add_host_monitor
     # @deprecated replaced with {#setup_host_monitor}
     def load_host_monitor(web_apps); add_host_monitor(web_apps); end
 
-    def add_ajp_connector(tomcat = @tomcat)
-      options = config[:ajp]
-      options = {
-        :address => @config[:address], :port => @config[:port]
-      }.merge!( options.respond_to?(:[]) ? options : {} )
+    def add_ajp_connector(options = config[:ajp], tomcat = nil)
+      # backwards compatibility - single argument (tomcat = @tomcat)
+      if options && ! options.respond_to?(:[])
+        tomcat = options; options = config[:ajp]
+      else
+        tomcat = @tomcat
+      end if tomcat.nil?
+
+      options = options.respond_to?(:[]) ? options.dup : {}
+      options[:address] = config[:address] unless options.key?(:address)
 
-      add_service_connector(options, options[:protocol_handler] || 'AJP/1.3', tomcat)
+      add_service_connector(options, 'AJP/1.3', tomcat)
     end
 
-    def add_http_connector(tomcat = @tomcat)
-      options = config[:http]
-      options = {
-        :address => @config[:address], :port => @config[:port]
-      }.merge!( options.respond_to?(:[]) ? options : {} )
+    def add_http_connector(options = config[:http], tomcat = nil)
+      # backwards compatibility - single argument (tomcat = @tomcat)
+      if options && ! options.respond_to?(:[])
+        tomcat = options; options = config[:http]
+      else
+        tomcat = @tomcat
+      end if tomcat.nil?
+
+      options = options.respond_to?(:[]) ? options.dup : {}
+      options[:port] = config[:port] || 3000 unless options.key?(:port)
+      options[:address] = config[:address] unless options.key?(:address)
 
       if options.delete(:nio)
         options[:protocol_handler] ||= 'org.apache.coyote.http11.Http11NioProtocol'
       end
 
       if options.delete(:apr)
-        tomcat.server.add_lifecycle_listener(Trinidad::Tomcat::AprLifecycleListener.new)
+        tomcat.server.add_lifecycle_listener(Tomcat::AprLifecycleListener.new)
       end
 
-      add_service_connector(options, options[:protocol_handler] || 'HTTP/1.1', tomcat)
+      add_service_connector(options, 'HTTP/1.1', tomcat)
     end
 
-    def add_ssl_connector(tomcat = @tomcat)
-      options = config[:ssl]
-      options = {
-        :scheme => 'https', :secure => true, :SSLEnabled => 'true'
-      }.merge!( options.respond_to?(:[]) ? options : {} )
+    # @private
+    DEFAULT_KEYSTORE_FILE = 'ssl/keystore' # TODO review default location
+
+    def add_ssl_connector(options = config[:ssl], tomcat = nil)
+      # backwards compatibility - single argument (tomcat = @tomcat)
+      if options && ! options.respond_to?(:[])
+        tomcat = options; options = config[:ssl]
+      else
+        tomcat = @tomcat
+      end if tomcat.nil?
 
-      options[:keystoreFile] ||= options.delete(:keystore)
+      options = { :scheme => 'https', :secure => true }.merge!( options.respond_to?(:[]) ? options : {} )
+      options[:address] = config[:address] unless options.key?(:address)
+
+      if keystore_file = options.delete(:keystore) || options.delete(:keystore_file)
+        options[:keystoreFile] ||= keystore_file
+      end
+      options[:keystorePass] ||= options.delete(:keystore_pass) if options.key?(:keystore_pass)
+      # handle "custom" alternative SSL (casing) options :
+      options[:SSLEnabled] = options.delete(:ssl_enabled) || true # always true
+      options[:SSLCertificateFile] ||= options.delete(:ssl_certificate_file) if options.key?(:ssl_certificate_file)
+      options[:SSLCertificateKeyFile] ||= options.delete(:ssl_certificate_key_file) if options.key?(:ssl_certificate_key_file)
+      options[:SSLVerifyClient] ||= options.delete(:ssl_verify_client) if options.key?(:ssl_verify_client)
+      options[:SSLProtocol] ||= options.delete(:ssl_protocol) if options.key?(:ssl_protocol)
+      # NOTE: there's quite more SSL prefixed options with APR ...
 
       if ! options[:keystoreFile] && ! options[:SSLCertificateFile]
-        options[:keystoreFile] ||= 'ssl/keystore'
-        options[:keystorePass] ||= 'waduswadus42'
-        generate_default_keystore(options)
+        # generate one for development/testing SSL :
+        options[:keystoreFile] = DEFAULT_KEYSTORE_FILE
+        options[:keystorePass] ||= 'waduswadus42' # NOTE change/ask for default
+        if File.exist?(DEFAULT_KEYSTORE_FILE)
+          logger.info "Using (default) keystore at #{DEFAULT_KEYSTORE_FILE.inspect}"
+        else
+          generate_default_keystore(options)
+        end
       end
 
-      add_service_connector(options, nil, tomcat)
+      add_service_connector(options, 'HTTP/1.1', tomcat)
     end
 
     # NOTE: make sure to pass an options Hash that might be changed !
     def add_service_connector(options, protocol = nil, tomcat = @tomcat)
-      connector = Trinidad::Tomcat::Connector.new(protocol)
-      connector.scheme = options.delete(:scheme) if options[:scheme]
-      connector.secure = options.delete(:secure) || false
+      connector = Tomcat::Connector.new(options.delete(:protocol) || protocol)
+      connector.scheme = options.delete(:scheme) if options.key?(:scheme)
+      connector.secure = options.key?(:secure) ? options.delete(:secure) : false
       connector.port = options.delete(:port).to_i if options[:port]
 
-      if handler = options.delete(:protocol_handler)
+      if handler = options.delete(:protocol_handler) || options.delete(:protocol_handler_class_name)
         connector.protocol_handler_class_name = handler
       end
 
@@ -178,7 +227,7 @@ module Trinidad
         host.start_children = start unless start.nil?
         # public Context addWebapp(Host host, String url, String name, String docBase)
         tomcat.addWebapp(host, web_app.context_path, web_app.context_name, web_app.root_dir)
-      rescue java.lang.IllegalArgumentException => e
+      rescue Java::JavaLang::IllegalArgumentException => e
         if e.message =~ /addChild\:/
           context_name = web_app.context_name
           logger.error "could not add application #{context_name.inspect} from #{web_app.root_dir}\n" <<
@@ -189,7 +238,7 @@ module Trinidad
       ensure
         host.start_children = prev_start unless start.nil?
       end
-      Trinidad::Extensions.configure_webapp_extensions(web_app.extensions, tomcat, context)
+      Extensions.configure_webapp_extensions(web_app.extensions, tomcat, context)
       if lifecycle = web_app.define_lifecycle
         context.add_lifecycle_listener(lifecycle)
       end
@@ -197,7 +246,8 @@ module Trinidad
     end
 
     def deploy_web_apps(tomcat = self.tomcat)
-      add_host_monitor web_apps = create_web_apps
+      web_apps = create_web_apps
+      add_host_monitor web_apps
       web_apps
     end
 
@@ -274,7 +324,7 @@ module Trinidad
             app_base_name = File.basename(app_root)
             deployed = apps.find do |app_holder|; web_app = app_holder.web_app
               web_app.root_dir == app_root ||
-                web_app.context_path == Trinidad::Tomcat::ContextName.new(app_base_name).path
+                web_app.context_path == Tomcat::ContextName.new(app_base_name).path
             end
             if deployed
               logger.debug "Skipping auto-deploy from #{app_root} (already deployed)"
@@ -292,7 +342,7 @@ module Trinidad
     end
 
     def create_web_app(app_config)
-      host_name = app_config[:host_name] || 'localhost'
+      host_name = app_config[:host_name] || tomcat.host.name
       host = tomcat.engine.find_child(host_name)
       app_config[:root_dir] = web_app_root_dir(app_config, host)
 
@@ -340,7 +390,7 @@ module Trinidad
     end
 
     def create_host(app_base, host_config, tomcat = @tomcat)
-      host = Trinidad::Tomcat::StandardHost.new
+      host = Tomcat::StandardHost.new
       host.app_base = nil # reset default app_base
       host.deployXML = false # disabled by default
       setup_host(app_base, host_config, host)
@@ -382,8 +432,8 @@ module Trinidad
     # @deprecated renamed to {#set_system_properties}
     def load_default_system_properties; set_system_properties; end
 
-    def configure_logging(log_level)
-      Trinidad::Logging.configure(log_level)
+    def configure_logging(logging)
+      Trinidad::Logging.configure(logging)
     end
 
     def logger; @logger ||= self.class.logger; end
@@ -406,7 +456,8 @@ module Trinidad
       host
     end
 
-    DEFAULT_HOST_APP_BASE = 'webapps' # :nodoc:
+    # @private
+    DEFAULT_HOST_APP_BASE = 'webapps'
 
     def default_host_base?(host)
       host.app_base.nil? || ( host.app_base == DEFAULT_HOST_APP_BASE && host.name == 'localhost' )
@@ -452,10 +503,10 @@ module Trinidad
       end
     end
 
-    def select_host_apps(app_holders, host)
+    def select_host_apps(app_holders, host, tomcat = self.tomcat)
       app_holders.select do |app_holder|
         host_name = app_holder.web_app.host_name
-        ( host_name || 'localhost' ) == host.name
+        host_name ? host_name == host.name : host == tomcat.host # default host
       end
     end
 
@@ -506,25 +557,28 @@ module Trinidad
       end
     end
 
-    def generate_default_keystore(config)
-      keystore_file = java.io.File.new(config[:keystoreFile])
-
-      if ! keystore_file.parent_file.exists && ! keystore_file.parent_file.mkdir
-          raise "Unable to create keystore folder: #{keystore_file.parent_file.canonical_path}"
+    def generate_default_keystore(file, pass = nil) # or (config)
+      file, pass = file[:keystoreFile], file[:keystorePass] if pass.nil?
+      file = Java::JavaIo::File.new(file)
+      keystore_dir = file.parent_file
+      if ! keystore_dir.exists && ! keystore_dir.mkdir
+        raise "Unable to create keystore folder: #{keystore_dir.canonical_path}"
       end
 
-      key_tool_args = ["-genkey",
+      key_tool_args = [ "-genkey",
         "-alias", "localhost",
-        "-dname", "CN=localhost, OU=Trinidad, O=Trinidad, C=ES",
+        "-dname", dname = "CN=localhost, OU=Trinidad, O=Trinidad, C=ES",
         "-keyalg", "RSA",
         "-validity", "365",
         "-storepass", "key",
-        "-keystore", config[:keystoreFile],
-        "-storepass", config[:keystorePass],
-        "-keypass", config[:keystorePass]]
+        "-keystore", file.absolute_path,
+        "-storepass", pass,
+        "-keypass", pass ]
+
+      logger.info "Generating a (default) keystore for localhost #{dname.inspect} at " <<
+                  "#{file.canonical_path} (password: '#{pass}')"
 
-      key_tool = Java::SunSecurityTools::KeyTool
-      key_tool.main key_tool_args.to_java(:string)
+      Java::SunSecurityTools::KeyTool.main key_tool_args.to_java(:string)
     end
 
     def trap_signals

data/lib/trinidad/version.rb

@@ -1,3 +1,3 @@
 module Trinidad
-  VERSION = '1.4.5'
+  VERSION = '1.4.6'
 end

data/lib/trinidad/web_app.rb

@@ -3,7 +3,7 @@ require 'trinidad/configuration'
 module Trinidad
   class WebApp
 
-    @@defaults = Trinidad::Configuration::DEFAULTS
+    @@defaults = Configuration::DEFAULTS
 
     attr_reader :config, :default_config
 
@@ -24,14 +24,18 @@ module Trinidad
       config.key?(key) ? config[key] : default_config[key]
     end
 
+    def []=(key, value)
+      config[key.to_sym] = value
+    end
+
     def key?(key, use_default = true)
       key = key.to_sym
       return true if config.has_key?(key)
       use_default ? default_config.key?(key) : false
     end
 
-    %w{ root_dir rackup async_supported reload_strategy host_name }.each do |method|
-      class_eval "def #{method}; self[:'#{method}']; end"
+    %w{ root_dir rackup async_supported reload_strategy host_name }.each do
+      |method| class_eval "def #{method}; self[:'#{method}']; end"
     end
 
     alias_method :web_app_dir, :root_dir # is getting deprecated soon
@@ -54,6 +58,8 @@ module Trinidad
     # JRuby-Rack correctly resolves relative paths for the context!
     def doc_base; self[:doc_base] || root_dir; end
 
+    def allow_linking; key?(:allow_linking) ? self[:allow_linking] : true; end
+
     def jruby_min_runtimes
       if min = config[:jruby_min_runtimes]
         return min.to_i # min specified overrides :threadsafe
@@ -173,6 +179,9 @@ module Trinidad
       end
     end
 
+    # TODO: internal API - should be configurable/adjustable with context.yml !
+    def context_manager; Java::RbTrinidadContext::DefaultManager.new end
+
     def logging
       @logging ||= begin
         defaults = {
@@ -185,7 +194,7 @@ module Trinidad
             :rotate => true
           }
         }
-        Trinidad::Configuration.merge_options(defaults, self[:logging])
+        Configuration.merge_options(defaults, self[:logging])
       end
     end
 
@@ -271,7 +280,7 @@ module Trinidad
     def generate_class_loader; class_loader!; end
 
     def define_lifecycle
-      Trinidad::Lifecycle::WebApp::Default.new(self)
+      Lifecycle::WebApp::Default.new(self)
     end
 
     # Reset the hold web application state so it gets re-initialized.
@@ -394,7 +403,7 @@ module Trinidad
     end
 
     def threadsafe?
-      jruby_min_runtimes == 1 && jruby_max_runtimes == 1
+      jruby_min_runtimes == 1 && jruby_max_runtimes == 1 # handles [:threadsafe]
     end
 
     protected
@@ -509,7 +518,7 @@ module Trinidad
     end
 
     def logger
-      @logger ||= Trinidad::Logging::LogFactory.getLog('')
+      @logger ||= Logging::LogFactory.getLog('')
     end
 
     protected
@@ -638,7 +647,7 @@ module Trinidad
   end
 
   # Rack web application (looks for a "rackup" *config.ru* file).
-  class RackupWebApp < WebApp
+  class RackWebApp < WebApp
 
     def context_params
       add_context_param 'app.root', app_root
@@ -655,6 +664,7 @@ module Trinidad
     def web_xml_environment; web_xml_context_param('rack.env'); end
 
   end
+  RackupWebApp = RackWebApp
 
   # Rails web application specifics (supports same versions as JRuby-Rack).
   class RailsWebApp < WebApp
@@ -694,8 +704,8 @@ module Trinidad
     def self.threadsafe_match?(file)
       File.exist?(file) && (
         file_line_match?(file, /^[^#]*threadsafe!/) || ( # Rails 4.0
-          file_line_match?(file, /^[^#]*config\.eager_load = true/) &&
-          file_line_match?(file, /^[^#]*config\.cache_classes = true/)
+          file_line_match?(file, /^[^#]*config\.eager_load\s?*=\s?*true/) &&
+          file_line_match?(file, /^[^#]*config\.cache_classes\s?*=\s?*true/)
         )
       )
     end
@@ -715,7 +725,7 @@ module Trinidad
     def context_path
       @path ||= begin
         path = File.basename(super)
-        context_name = Trinidad::Tomcat::ContextName.new(path)
+        context_name = Tomcat::ContextName.new(path)
         context_name.path # removes .war handles ## versioning
       end
     end
@@ -751,12 +761,14 @@ module Trinidad
       warbler? ? super : @context_params ||= {}
     end
 
+    def context_manager; nil end
+
     def layout_class
       'JRuby::Rack::WebInfLayout'
     end
 
     def define_lifecycle
-      Trinidad::Lifecycle::WebApp::War.new(self)
+      Lifecycle::WebApp::War.new(self)
     end
 
     private

data/trinidad.gemspec

@@ -10,9 +10,10 @@ Gem::Specification.new do |gem|
   gem.description = "Trinidad allows you to run Rails or Rack applications within " <<
     "an embedded Apache Tomcat container. Serves your requests with the elegance of a cat !"
 
-  gem.authors  = ["David Calavera"]
+  gem.authors  = ['David Calavera']
   gem.email    = 'calavera@apache.org'
-  gem.homepage = 'http://github.com/trinidad/trinidad'
+  gem.homepage = 'https://github.com/trinidad/trinidad'
+  gem.licenses = ['MIT', 'Apache-2.0']
 
   gem.require_paths = %w[lib]
   gem.executables = ["trinidad"]
@@ -21,11 +22,11 @@ Gem::Specification.new do |gem|
   gem.rdoc_options = ["--charset=UTF-8"]
   gem.extra_rdoc_files = %w[README.md LICENSE]
 
-  gem.add_dependency('trinidad_jars', ">= 1.2.3")
-  gem.add_dependency('jruby-rack', ">= 1.1.13")
+  gem.add_dependency('trinidad_jars', '>= 1.3.0', '< 1.5.0')
+  gem.add_dependency('jruby-rack', '~> 1.1.13')
 
   gem.add_development_dependency('rake')
-  gem.add_development_dependency('rspec', '~> 2.12.0')
+  gem.add_development_dependency('rspec', '~> 2.14.1')
   gem.add_development_dependency('mocha', '~> 0.12.1')
   gem.add_development_dependency('fakefs', '>= 0.4.0')
 

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trinidad
 version: !ruby/object:Gem::Version
-  version: 1.4.5
-  prerelease:
+  version: 1.4.6
 platform: ruby
 authors:
 - David Calavera
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trinidad_jars
@@ -17,30 +16,32 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.3
-    none: false
+        version: 1.3.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.5.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.3
-    none: false
+        version: 1.3.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.5.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: jruby-rack
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.13
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.13
-    none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -50,13 +51,11 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -65,14 +64,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
-    none: false
+        version: 2.14.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
-    none: false
+        version: 2.14.1
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -82,13 +79,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.12.1
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.12.1
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -98,13 +93,11 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
-    none: false
   prerelease: false
   type: :development
 description: Trinidad allows you to run Rails or Rack applications within an embedded Apache Tomcat container. Serves your requests with the elegance of a cat !
@@ -141,8 +134,11 @@ files:
 - lib/trinidad/web_app.rb
 - rakelib/tomcat.rake
 - trinidad.gemspec
-homepage: http://github.com/trinidad/trinidad
-licenses: []
+homepage: https://github.com/trinidad/trinidad
+licenses:
+- MIT
+- Apache-2.0
+metadata: {}
 post_install_message:
 rdoc_options:
 - --charset=UTF-8
@@ -152,24 +148,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
       version: '0'
-      hash: 2
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
       version: '0'
-      hash: 2
-  none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.1.9
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: Web server for Rails/Rack applications built upon JRuby::Rack and Apache Tomcat
 test_files: []