trinidad 1.5.0.B1 → 1.5.0.B2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9f931542c2c97ff175af70b7cfa4d7aa032c645
-  data.tar.gz: f55ee60e3b061ea7a91889e9ed1e9438581f3091
+  metadata.gz: d42b0b5a750187bec38027af191d746359b4b920
+  data.tar.gz: 72ea1bd9f167bdf9393835dff38421ae3412f81d
 SHA512:
-  metadata.gz: 03cc89e6b175adbd918d099ed5224edca53e4cdb8bc8ee0d45276cf171e473bb0c09086930340201cf9f7aeb4ede770d7f34564c7a6bdf330d2758f8f78f5888
-  data.tar.gz: 66b2f839079014480fd298cfd6c3798909449fa6a3ee281bb45e3c37678407fd8e863ac2df08225756c4e6c4cb16cf4ede87be6dc0aac6e8461a4bf4df9b05eb
+  metadata.gz: dafb64f115d6305e00dc4a6b203714721d1a9e3a14a1437ea8f1aa7fb8e96bf673ae6ee820f799ac3914374ab542e8d86aaea7d87d0ae36f76e0732dffc6146a
+  data.tar.gz: dd4e382b8d8a5a4ee69d83df8c9a12d2c7199f2b8459de127c96a0818169e2d7491877e7a0e6e85b1fa43107abe38cf95861ea8fb7cd41eeadac3056b17132c9

data/Gemfile

@@ -1,28 +1,29 @@
 source 'https://rubygems.org'
 
-gemspec :name => "trinidad"
+gemspec :name => 'trinidad'
 
 # NOTE: allows testing with various jar versions
-if (jars = ENV['trinidad_jars']) && jars != 'false'
+if (jars = ENV['TRINIDAD_JARS_VERSION']) && jars != 'false'
   if jars =~ /\d\.\d\.\d/
     # concrete version e.g. '1.0.8' or '>= 1.0.8'
     gem 'trinidad_jars', jars
   else
-    # pre-release version e.g. `export trinidad_jars=true`
-    gem 'trinidad_jars', :path => (jars == 'true' ? '.' : jars)
+    # pre-release version e.g. `export TRINIDAD_JARS_VERSION=local`
+    gem 'trinidad_jars', :path => (jars == 'true' || jars == 'local' ? '.' : jars)
   end
 end
 
-gem 'rake', '< 10.2.0', :require => nil, :groups => [ :development, :test ]
+gem 'rake', '~> 10.4.2', :require => nil, :groups => [ :development, :test ]
+
 group :development do
   jruby_version = ENV['JRUBY_VERSION']
   jruby_version = JRUBY_VERSION if jruby_version == 'current'
   jruby_version ||= '1.6.8' # by default compiling against JRuby 1.6.8
   gem 'jruby-jars', jruby_version, :require => nil # only for _javac_
+end
 
-  if jruby_rack_version = ENV['JRUBY_RACK_VERSION']
-    gem 'jruby-rack', jruby_rack_version, :require => false
-  end
+if jruby_rack_version = ENV['JRUBY_RACK_VERSION']
+  gem 'jruby-rack', jruby_rack_version, :require => false
 end
 
 group :integration do
@@ -36,6 +37,18 @@ group :integration do
   else
     gem 'rails', :require => nil, :group => :test
   end
+  if RUBY_VERSION.index('1.8') == 0
+    gem 'i18n', '< 0.7', :require => nil, :group => :test
+    gem 'sprockets', '< 3.0', :require => nil, :group => :test
+    gem 'mime-types', '< 2.3', :require => nil, :group => :test
+  elsif RUBY_VERSION.index('1.9.2') == 0
+    gem 'i18n', '< 0.7', :require => nil, :group => :test
+    gem 'sprockets', '< 3.0', :require => nil, :group => :test
+    gem 'mime-types', '< 3.0', :require => nil, :group => :test
+  end
+  if RUBY_VERSION < '2.0'
+    gem 'rack-cache', '< 1.3.0', :require => nil, :group => :test
+  end
   gem 'jruby-openssl' if JRUBY_VERSION < '1.7.0'
   # eval(File.read("spec/integration/rails32/Gemfile"), binding)
 end

data/History.md

@@ -1,3 +1,58 @@
+## trinidad 1.5.0.B2 (2016-07-14)
+
+* default to async_supported: true style servlet configuration
+* assume thread-safe by default and avoid config.threadsafe! detection in Rails
+* improve JRuby 9K compatibility - avoid setting jruby.compat.version parameter
+* fixes for rolling reload when context has been destroyed (see #133)
+* support setting `:keystore_type` (for SSL)
+* handle auto-loading of `Trinidad::CommandLineParser` constant for init service's
+  Trinidad::Daemon backwards-compatibility (see https://github.com/trinidad/trinidad_init_services/issues/41)
+* support for running fully on Java 8 (class sun.security.tools.KeyTool seems gone)
+
+## trinidad_jars 1.5.1 (2016-07-14)
+
+* adjust (timer) cleanup for newer pg-jdbc driver versions
+
+* Tomcat 7.0.64 http://tomcat.apache.org/tomcat-7.0-doc/changelog.html
+
+## trinidad_jars 1.5.0 (2016-07-13)
+
+* Tomcat 7.0.59 http://tomcat.apache.org/tomcat-7.0-doc/changelog.html
+
+## trinidad_jars 1.4.2 (2015-10-09)
+
+* Tomcat 7.0.57 http://tomcat.apache.org/tomcat-7.0-doc/changelog.html
+* workaround for postgres reloading issues (#133) ... affects 1.5.0 only
+
+## trinidad_jars 1.4.1 (2015-05-01)
+
+* Tomcat 7.0.55 https://tomcat.apache.org/security-7.html#Fixed_in_Apache_Tomcat_7.0.55
+  fixes multiple security vulnerabilities since Tomcat 7.0.50
+* do potential MariaDB driver cleanup (an alternative for the MySQL official driver)
+* updated JarScanner internals so we're compilant
+
+## trinidad 1.5.0.B1 (2014-03-27)
+
+* make sure the context.name does include the original name (after reload)
+* set server's parent class-loader for Class.forName to work better from Tomcat
+* add the jruby-rack.jar to web-app's loader instead of using the one loaded
+* start defaulting to "sensible" thread-safe
+  in development/test mode we shall start the same (thread-safe) way as in production
+* set "reloader" (java) thread name for easier identification
+* handle `address: *` since it broke on adding a JMX bean with * in it's name (which is not a valid one)
+* allow to disable (inherited) web-app extension by specifying `name: false`
+* remove some of the 'old' deprecated methods/configuration
+* class-loader kung-fu to get thigns right towards leak free applications ...
+* we're still binding by default to localhost/127.0.0.1 - change to '*' (#119)
+
+## trinidad_jars 1.4.0 (2014-03-27)
+
+* Tomcat 7.0.50 http://tomcat.apache.org/tomcat-7.0-doc/changelog.html
+* a "faster" (default) JarScanner for Rack/Rails applications
+  based on TC's StandardJarScanner implementation
+* an extended (default) web-app loader (to handle JRuby specific "leaks")
+  as well as some MySQL and PostgreSQL JDBC driver specific cleanup
+
 ## trinidad 1.4.6 (2013-12-28)
 
 * default :port for SSL is now (a more Ruby-sh) 3443

data/LICENSE

@@ -1,6 +1,6 @@
 == Trinidad
 
-Copyright (c) 2014 Team Trinidad and contributors http://github.com/trinidad
+Copyright (c) 2014-2016 Team Trinidad and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -19,12 +19,16 @@ Trinidad's goals with bringing Tomcat into JRuby land are mostly the following :
 ## Installation
 
 [![gem version](https://badge.fury.io/rb/trinidad.png)](http://rubygems.org/gems/trinidad)
+[![dependency status](https://gemnasium.com/trinidad/trinidad.png)][1]
 
 ```
 $ jruby -S gem install trinidad
 ```
 
-Trinidad requires (and supports) JRuby 1.6.8 or later (latest 1.7.x recommended).
+**NOTE:** please use **1.5.0.B2** `gem install trinidad --pre`, esp. on JRuby 9K,
+as Trinidad 1.4 will no longer receive Tomcat (7.0.x) security updates.
+
+Trinidad 1.4 requires (and supports) JRuby 1.6.8 or later (latest 1.7.x recommended).
 
 ## Quick Start
 
@@ -46,9 +50,9 @@ and than run `trinidad` - keep in mind a server is not an application dependency
 
 ### Rails
 
-Trinidad supports the same Rails version as the JRuby-Rack it founds (or is
-specified/locked in your *Gemfile*), which is **2.3**, **3.x** as well as
-**4.0** for JRuby-Rack 1.1.x (and the coming 1.2). Merb is not supported.
+Trinidad supports the same Rails version as the JRuby-Rack it founds on (or is
+specified/locked in your *Gemfile*), which are **4.x**, **3.x** and even **2.3**
+for JRuby-Rack 1.1.x (and the up coming 1.2). Merb is not supported.
 
 ```
 $ trinidad
@@ -80,7 +84,7 @@ configure do
 end
 ```
 
-### Rackup
+### Rack
 
 Trinidad auto-detects a plain-old Rack application (if there's a *config.ru*) :
 
@@ -106,16 +110,17 @@ the same way as JRuby-Rack (since it boots all applications), that is :
 - otherwise the rack (gem) version might be specified using a magic comment in
   *config.ru* as `# rack.version: ~>1.4.0` (or the latest installed gem is used)
 
-**NOTE:** We do recommend to use the plain `trinidad` mode for running apps
+**NOTE:** We recommend to use the plain `trinidad` mode for running apps
 (in production), since it supports runtime pooling while the "rackup" mode does
 not, it also provides you with better Java integration possibilities.
 
 Also note that Trinidad does not mimic JRuby-Rack's (1.1.x) backwards compatible
 behavior of starting a pool for Rails but booting a thread-safe runtime for
-plain Rack applications by default. Currently, runtime pooling is the default
-with Trinidad and stays the same no matter the type of the application.
-We expect this default to (most likely) change in a future version of Trinidad
-as thread-safe gets more adopted by (stable) releases of Rails 4.0.
+plain Rack applications by default. Runtime pooling is the default with Trinidad
+**1.4** and stays the same no matter the type of the application. This has
+**changed in Trinidad 1.5** and it assumes thread-safe applications by default.
+
+All major rack versions (< 2.0) are expected to be working fine with Trinidad.
 
 ## Configuration
 
@@ -285,7 +290,7 @@ failed releasing memory with reloads. This has been fixed in **1.5.0** please
 consider updating, it is meant to be backwards compatible.
 
 If you're on Java 6 you will likely need to tune your JAVA_OPTS / JRUBY_OPTS
-for the JVM to do class unloading (consult the [wiki][] for more information) :
+for the JVM to do class unloading (consult the [wiki][6] for more information) :
 ```
 JRUBY_OPTS="$JRUBY_OPTS -J-XX:+UseConcMarkSweepGC -J-XX:+CMSClassUnloadingEnabled"
 ```
@@ -387,20 +392,19 @@ You can find further information on how to write extensions in the [wiki][5].
 
 ## Support
 
-* Contact [kares][0] if your team needs JRuby or Trinidad help and support
-* [Logic Haus][1] provides JRuby related training and development services
-* Mailing List: http://groups.google.com/group/rails-trinidad
-* Bug Tracker: https://github.com/trinidad/trinidad/issues
-* IRC [Channel on FreeNode][3]: #trinidad (or ask in #jruby)
+* ask us for help on [gitter][2] or use [SO][3] ... we shall get notified
+* we're also on the JRuby mailing List: http://wiki.jruby.org/MailingLists
+* and the #jruby IRC [channel](http://webchat.freenode.net/?channels=jruby)
+* please report issues at: https://github.com/trinidad/trinidad/issues
 
 ## Copyright
 
-Copyright (c) 2014 [Team Trinidad](https://github.com/trinidad).
+Copyright (c) 2016 [Team Trinidad](https://github.com/trinidad).
 See LICENSE (http://en.wikipedia.org/wiki/MIT_License) for details.
 
-[0]: http://kares.org
-[1]: http://logichaus.com/jruby.html
-[3]: http://webchat.freenode.net/?channels=jruby
+[1]: https://gemnasium.com/trinidad/trinidad
+[2]: https://gitter.im/trinidad
+[3]: http://stackoverflow.com/questions/tagged/jruby
 [4]: http://tomcat.apache.org/tomcat-7.0-doc/config/host.html
 [5]: https://github.com/trinidad/trinidad/wiki/extensions
 [6]: https://github.com/trinidad/trinidad/wiki/JOPTS

data/Rakefile

@@ -26,11 +26,8 @@ task :clean_jars => :clear_jars
 
 ['trinidad', 'trinidad_jars'].each do |name|
   gem_helper = Bundler::GemHelper.new(Dir.pwd, name)
-  def gem_helper.version_tag
-    "#{name}-#{version}" # override "v#{version}"
-  end
-  version = gem_helper.send(:version)
-  version_tag = gem_helper.version_tag
+  def gem_helper.version_tag; "#{name}-#{version}" end
+  version = gem_helper.send(:version); version_tag = gem_helper.version_tag
   namespace name do
     desc "Build #{name}-#{version}.gem into the pkg directory"
     task('build') { gem_helper.build_gem }
@@ -42,6 +39,18 @@ task :clean_jars => :clear_jars
     task('release') { gem_helper.release_gem }
   end
 end
+unless Bundler::GemHelper.method_defined?(:release_gem)
+  Bundler::GemHelper.send :define_method, :release_gem do
+    guard_clean
+    tag_version unless already_tagged?
+    built_gem_path = build_gem
+    rubygem_push(built_gem_path) if gem_push?
+  end
+  Bundler::GemHelper.send :define_method, :install_gem do
+    built_gem_path = build_gem
+    install_gem(built_gem_path)
+  end
+end
 
 TOMCAT_CORE_JAR = File.expand_path('../trinidad-libs/tomcat-core.jar', __FILE__)
 TRINIDAD_RB_JAR = File.expand_path('../trinidad-libs/trinidad-rb.jar', __FILE__)
@@ -52,9 +61,9 @@ module TrinidadRakeHelpers
     source = '1.6'; target = '1.6' # java-compiler settings
     FileUtils.mkdir target_dir unless File.exist?(target_dir)
     class_path = class_path.join(':') unless class_path.is_a?(String)
-    sh "javac -Xlint:deprecation -Xlint:unchecked " <<
-       " -g -source #{source} -target #{target} " <<
-       " -classpath #{class_path} -d #{target_dir} " <<
+    sh "javac -Xlint:deprecation -Xlint:unchecked " +
+       " -g -source #{source} -target #{target} " +
+       " -classpath #{class_path} -d #{target_dir} " +
        Dir["#{source_dir}/**/*.java"].join(" ")
   end
 

data/lib/trinidad.rb

@@ -14,6 +14,7 @@ module Trinidad
   require 'trinidad/logging'
 
   autoload :CLI, 'trinidad/cli'
+  autoload :CommandLineParser, 'trinidad/cli'
 
   module Lifecycle
 

data/lib/trinidad/configuration.rb

@@ -34,10 +34,11 @@ module Trinidad
 
     DEFAULTS = {
       :environment => 'development',
-      :context_path => '/',
+      :context_path => '', # / root path
       :public => 'public',
       :java_lib => 'lib/java',
       :default_web_xml => 'config/web.xml',
+      :async_supported => true,
       :trap => true
     }
 
@@ -73,17 +74,51 @@ module Trinidad
       end
     end
 
-    %w{ port address environment context_path
-        java_lib java_classes default_web_xml
-        jruby_min_runtimes jruby_max_runtimes jruby_compat_version
-        rackup servlet rack_servlet default_servlet public hosts
-        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"
+    KEYS = Hash.[]( # { :port => nil, :address => nil, ... }
+    [ :port, :address, :environment, :context_path,
+      :java_lib, :java_classes, :default_web_xml,
+      :jruby_min_runtimes, :jruby_max_runtimes, :jruby_compat_version,
+      :rackup, :public, :hosts, :rack_servlet, :default_servlet, :jsp_servlet,
+      :http, :ajp, :ssl, :https, :extensions,
+      :apps_base, :web_apps, :web_app_dir,
+      :monitor, :reload_strategy, :log, :trap ].each_slice(1).to_a)
+    private_constant :KEYS rescue nil
+
+    def public; self[:public] end
+    def public=(value); self[:public] = value end
+
+    def trap; self[:trap] end
+    def trap=(value); self[:trap] = value end
+
+    def method_missing(method, *args, &block)
+      if method[-1].eql? '='
+        if KEYS.key?(method = method[0...-1].to_sym)
+          if args.size != 1
+            raise ArgumentError, "wrong number of arguments (given #{args.size}, expected 1)"
+          end
+          return self[method] = args[0]
+        end
+      else
+        return self[method] if KEYS.key?(method)
+      end
+      super
+    end
+
+    def respond_to_missing?(method, include_private = false)
+      KEYS.key?(method) || super
+    end
+
+    # @deprecated
+    def servlet
+      Helpers.deprecated('configuration option :servlet, use :rack_servlet')
+      self[:servlet]
+    end
+
+    # @deprecated
+    def servlet=(value)
+      Helpers.deprecated('configuration option :servlet, use :rack_servlet')
+      self[:servlet] = value
     end
-    # TODO deprecate servlet
 
     # @private
     def self.symbolize_options(options)

data/lib/trinidad/lifecycle/host.rb

@@ -59,9 +59,10 @@ module Trinidad
       end
 
       def init_monitors
-        for app_holder in app_holders
-          monitor = app_holder.monitor; opts = 'w+'
-          if ! File.exist?(dir = File.dirname(monitor))
+        app_holders.each do |app_holder|
+          monitor = app_holder.monitor
+          opts = 'w+'
+          if ! File.exist?(dir = File.dirname(monitor)) # waR?
             Dir.mkdir dir
           elsif File.exist?(monitor)
             opts = 'r'
@@ -73,7 +74,7 @@ module Trinidad
       end
 
       def check_monitors
-        for app_holder in app_holders
+        app_holders.each do |app_holder|
           # double check monitor, capistrano removes it temporarily
           unless File.exist?(monitor = app_holder.monitor)
             sleep(0.5)

data/lib/trinidad/lifecycle/host/rolling_reload.rb

@@ -75,11 +75,15 @@ module Trinidad
           new_context = event.lifecycle
           new_context.remove_lifecycle_listener(self) # GC old context
 
-          logger.debug "Stoping the old Context for [#{@old_context.path}]"
-
-          @old_context.stop
-          @old_context.work_dir = nil # make sure it's not deleted
-          @old_context.destroy
+          if @old_context.state_name =~ /DESTROYED/i
+            logger.debug "Old context for [#{@old_context.path}] is already destroyed"
+            @old_context.work_dir = nil
+          else
+            logger.debug "Stopping the old context for [#{@old_context.path}]"
+            @old_context.stop
+            @old_context.work_dir = nil # make sure it's not deleted
+            @old_context.destroy
+          end
           # NOTE: name might not be changed once added to a parent
           #new_context.name = @old_context.name
           super

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

@@ -8,6 +8,7 @@ module Trinidad
       else
         JRubyJars.jruby_rack_jar_path
       end
+      private_constant :JRUBY_RACK_JAR_PATH rescue nil
 
       # Shared web application lifecycle hook,
       # does #configure before the context starts.

data/lib/trinidad/logging.rb

@@ -1,15 +1,23 @@
 require 'jruby'
-require 'fileutils'
 
 module Trinidad
   module Logging
 
+    # @private
     JUL = Java::JavaUtilLogging
+    # @private
     LogFactory = Java::OrgApacheJuliLogging::LogFactory
 
+    # A message formatter only prints the log message (and the thrown value).
+    # @private
+    MessageFormatter = Java::RbTrinidadLogging::MessageFormatter
+    # @private
+    DefaultFormatter = Java::RbTrinidadLogging::DefaultFormatter
+
     @@configured = nil
 
-    # Configure the "global" Trinidad logging.
+    # Configure the ("global") logging sub-system.
+    # If invoked twice, does only actually configure once.
     def self.configure(log_level = nil)
       return false if @@configured
       @@configured = true
@@ -17,7 +25,9 @@ module Trinidad
       root_logger = JUL::Logger.getLogger('')
       level = parse_log_level(log_level, :INFO)
 
-      out_handler = new_console_handler JRuby.runtime.out
+      runtime_out = JRuby.runtime.out
+      runtime_err = JRuby.runtime.err
+      out_handler = new_console_handler runtime_out
       out_handler.formatter = console_formatter
 
       root_logger.synchronized do
@@ -26,10 +36,10 @@ module Trinidad
         end
 
         root_logger.add_handler(out_handler)
-        if JRuby.runtime.out != Java::JavaLang::System.out ||
-           JRuby.runtime.err != Java::JavaLang::System.err
+        if runtime_out != Java::JavaLang::System.out ||
+           runtime_err != Java::JavaLang::System.err
          # NOTE: only add err handler if customized STDOUT or STDERR :
-        err_handler = new_console_handler JRuby.runtime.err
+        err_handler = new_console_handler runtime_err
         err_handler.formatter = console_formatter
         err_handler.level = level.intValue > JUL::Level::WARNING.intValue ?
           level : JUL::Level::WARNING # only >= WARNING on STDERR
@@ -43,7 +53,7 @@ module Trinidad
       root_logger
     end
 
-    # Force logging (re-)configuration.
+    # Force logging re-configuration.
     # @see #configure
     def self.configure!(log_level = nil)
       ( @@configured = false ) || configure(log_level)
@@ -114,12 +124,17 @@ module Trinidad
     def self.parse_log_level(log_level, default = nil)
       log_level = log_level && log_level.to_s.upcase
       unless JUL::Level.constants.find { |level| level.to_s == log_level }
-        log_level = { # try mapping common level names to JUL names
-          'ERROR' => 'SEVERE', 'WARN' => 'WARNING', 'DEBUG' => 'FINE'
-        }[log_level]
-        log_level = default ? default.to_s.upcase : nil unless log_level
+        case log_level
+        when 'ERROR' then log_level = 'SEVERE'
+        when 'WARN' then log_level = 'WARNING'
+        when 'DEBUG' then log_level = 'FINE'
+        end # try mapping common level names to JUL names
+        log_level ||= default ? default.to_s.upcase : nil
       end
       JUL::Level.parse(log_level) if log_level
+    rescue => e
+      JUL::Logger.getLogger('').warning "Failed to parse log level #{log_level.inspect} (#{e})"
+      JUL::Level.const_get(default)
     end
 
     def self.set_log_level(logger, level)
@@ -137,19 +152,11 @@ module Trinidad
         'org.apache.catalina.core.StandardService',
         'org.apache.catalina.core.StandardEngine',
         'org.apache.catalina.startup.ContextConfig',
-        #'org.apache.coyote.http11.Http11Protocol',
-        'org.apache.catalina.core.ApplicationContext',
-        #'org.apache.catalina.core.AprLifecycleListener',
-        'org.apache.catalina.loader.WebappClassLoader',
-        'org.apache.tomcat.websocket.server.WsSci',
       ]
       for name in logger_names
         logger = JUL::Logger.getLogger(name)
         set_log_level(logger, level) if logger
       end
-
-      #set_log_level(JUL::Logger.getLogger('rb.trinidad.context.DefaultLoader'), JUL::Level::FINEST)
-
     end
 
     def self.web_app_context_param(web_app, context, name)
@@ -174,32 +181,8 @@ module Trinidad
       handler
     end
 
+    # @private
     FileHandler = Java::RbTrinidadLogging::FileHandler
 
-    # We're truly missing a #formatThrown exception helper method.
-    JUL::Formatter.class_eval do # :nodoc:
-
-      LINE_SEP = java.lang.System.getProperty("line.separator")
-
-      protected
-      def formatThrown(record)
-        if record.thrown
-          writer = java.io.StringWriter.new(1024)
-          print_writer = java.io.PrintWriter.new(writer)
-          print_writer.println
-          record.thrown.printStackTrace(print_writer)
-          print_writer.close
-          return writer.toString
-        end
-      end
-
-    end
-
-    # A message formatter only prints the log message (and the thrown value).
-    MessageFormatter = Java::RbTrinidadLogging::MessageFormatter
-
-    DefaultFormatter = Java::RbTrinidadLogging::DefaultFormatter
-
   end
-  LogFormatter = Logging::DefaultFormatter # backwards compatibility
 end

data/lib/trinidad/server.rb

@@ -176,6 +176,7 @@ module Trinidad
         options[:keystoreFile] ||= keystore_file
       end
       options[:keystorePass] ||= options.delete(:keystore_pass) if options.key?(:keystore_pass)
+      options[:keystoreType] ||= options.delete(:keystore_type) if options.key?(:keystore_type)
       # 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)
@@ -225,7 +226,8 @@ module Trinidad
       context = begin
         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)
+        context_path = web_app.context_path; context_path = '' if context_path == '/'
+        tomcat.addWebapp(host, context_path, web_app.context_name, web_app.root_dir)
       rescue Java::JavaLang::IllegalArgumentException => e
         if e.message =~ /addChild\:/
           context_name = web_app.context_name
@@ -388,9 +390,11 @@ module Trinidad
       end if web_apps
     end
 
+    Tomcat::StandardHost.send :field_writer, :appBase
+
     def create_host(app_base, host_config, tomcat = @tomcat)
       host = Tomcat::StandardHost.new
-      host.app_base = nil # reset default app_base
+      host.appBase = nil # reset default app_base
       host.deployXML = false # disabled by default
       setup_host(app_base, host_config, host)
       tomcat.engine.add_child host if tomcat
@@ -572,7 +576,7 @@ module Trinidad
 
       key_tool_args = [ "-genkey",
         "-alias", "localhost",
-        "-dname", 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",
@@ -583,7 +587,14 @@ module Trinidad
       logger.info "Generating a (default) keystore for localhost #{dname.inspect} at " <<
                   "#{file.canonical_path} (password: '#{pass}')"
 
-      Java::SunSecurityTools::KeyTool.main key_tool_args.to_java(:string)
+      key_tool = nil
+      begin
+        key_tool = Java::SunSecurityTools::KeyTool
+      rescue NameError # Java 8 seems to have removed it completely
+        `keytool #{key_tool_args.join(' ')}` # NOTE: use for all JDK versions
+      else
+        key_tool.main key_tool_args.to_java(:string)
+      end
     end
 
     def trap_signals

data/lib/trinidad/version.rb

@@ -1,3 +1,3 @@
 module Trinidad
-  VERSION = '1.5.0.B1'
+  VERSION = '1.5.0.B2'
 end

data/lib/trinidad/web_app.rb

@@ -34,9 +34,11 @@ module Trinidad
       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"
-    end
+    def root_dir; self[:root_dir] end
+    def rackup; self[:rackup] end
+    def host_name; self[:host_name] end
+    def async_supported; self[:async_supported] end
+    def reload_strategy; self[:reload_strategy] end
 
     alias_method :web_app_dir, :root_dir # is getting deprecated soon
     def app_root; root_dir; end
@@ -46,7 +48,7 @@ module Trinidad
 
     def context_path
       path = self[:context_path] || self[:path]
-      path ? path.to_s : path
+      path ? path.to_s : path #
     end
 
     def context_name
@@ -92,7 +94,9 @@ module Trinidad
     end
 
     def jruby_compat_version
-      fetch_config_value(:jruby_compat_version, RUBY_VERSION)
+      compat_version = fetch_config_value(:jruby_compat_version, false)
+      return compat_version unless compat_version.eql? false
+      JRUBY_VERSION < '9.0' ? RUBY_VERSION[0, 3] : nil
     end
 
     def environment
@@ -173,7 +177,9 @@ module Trinidad
         add_context_param 'jruby.initial.runtimes', jruby_initial_runtimes
         add_context_param 'jruby.runtime.acquire.timeout', jruby_runtime_acquire_timeout
       end
-      add_context_param 'jruby.compat.version', jruby_compat_version
+      if compat_version = jruby_compat_version
+        add_context_param 'jruby.compat.version', compat_version
+      end
       add_context_param 'public.root', public_root
       add_context_param 'jruby.rack.layout_class', layout_class
       # JRuby::Rack::ErrorApp got a bit smarter so use it, TODO maybe override ?
@@ -184,9 +190,8 @@ module Trinidad
     def init_params; context_params; end
 
     def add_context_param(param_name, param_value)
-      @context_params ||= {}
       if ! param_value.nil? && ! web_xml_context_param(param_name)
-        @context_params[param_name] = param_value.to_s
+        (@context_params ||= {})[param_name] = param_value.to_s
       end
     end
 
@@ -422,7 +427,7 @@ module Trinidad
 
       return if key?(:jruby_max_runtimes) || key?(:jruby_min_runtimes)
 
-      if ( ! key?(:threadsafe) && ! detect_threadsafe? ) || self[:threadsafe] == false
+      if key?(:threadsafe) && self[:threadsafe] == false
         max_runtimes = config[:jruby_max_runtimes] = guess_max_runtimes
         if environment == 'development' || environment == 'test'
           config[:jruby_min_runtimes] = 1
@@ -434,6 +439,7 @@ module Trinidad
       end
     end
 
+    # @deprecated no longer used
     def detect_threadsafe?(environment = self.environment); true end
 
     def guess_max_runtimes; 5 end
@@ -590,8 +596,7 @@ module Trinidad
             ( default_config && default_config[:context_name] )
           path = name.to_s == 'default' ? '/' : "/#{name}"
         end
-        path = "/#{path}" if path.to_s[0, 1] != '/'
-        path.to_s
+        path.to_s[0, 1] != '/' ? "/#{path}" : path.to_s
       end
 
       private
@@ -672,6 +677,7 @@ module Trinidad
     # NOTE: maybe we can guess these based on connector maxThreads?
     # def guess_max_runtimes; 5 end
 
+    # @deprecated no longer used
     def detect_threadsafe?(environment = self.environment)
       if environment == 'development' || environment == 'test'
         # NOTE: it's best for development/test to use the same setup as in

data/rakelib/tomcat.rake

@@ -3,7 +3,7 @@ require 'tmpdir'
 
 namespace :tomcat do
   include TrinidadRakeHelpers
-  
+
   TOMCAT_MAVEN_REPO = 'http://repo2.maven.org/maven2/org/apache/tomcat'
 
   tomcat = "#{TOMCAT_MAVEN_REPO}/embed/tomcat-embed-core/%s/tomcat-embed-core-%s.jar"
@@ -11,7 +11,7 @@ namespace :tomcat do
   tomcat_logging = "#{TOMCAT_MAVEN_REPO}/embed/tomcat-embed-logging-log4j/%s/tomcat-embed-logging-log4j-%s.jar"
 
   dependencies = [ tomcat, tomcat_jasper, tomcat_logging ]
-  
+
   task :fetch, :version do |_, args|
     tomcat_version = [args[:version]] * 2
 
@@ -35,9 +35,9 @@ namespace :tomcat do
     end
     FileUtils.rm_r temp_dir
   end
-  
+
   TOMCAT_CORE_TARGET_DIR = File.expand_path('../../target/tomcat-core', __FILE__)
-  
+
   desc "Updates Tomcat to a given version e.g. `rake tomcat:update[7.0.30]`"
   task :update, :version do |_, args|
     Rake::Task['tomcat:fetch'].invoke(version = args[:version])
@@ -48,11 +48,11 @@ namespace :tomcat do
     file = File.read(path)
     file.gsub!(/TOMCAT_VERSION = '(.+)'/, "TOMCAT_VERSION = '#{version}'")
     File.open(path, 'w') { |io| io.write(file) }
-    
+
     puts "DONE - Tomcat's version has been updated to #{version} succesfully !\n"
-    puts "`export trinidad_jars=true && bundle install` to use the local trinidad_jars gem with bundler"
+    puts "`export TRINIDAD_JARS_VERSION=local && bundle install` to make sure you use the local trinidad_jars gem with Bundler"
   end
-  
+
   task :patch do
     Rake::Task['tomcat-core:jar'].invoke
   end
@@ -61,7 +61,7 @@ namespace :tomcat do
     rm TOMCAT_CORE_JAR if File.exist?(TOMCAT_CORE_JAR)
   end
   task :clean => :clear
-  
+
 end
 
 namespace :'tomcat-core' do
@@ -77,11 +77,11 @@ namespace :'tomcat-core' do
     end
     jar TOMCAT_CORE_TARGET_DIR, TOMCAT_CORE_JAR
   end
-  
+
   task :clear do
     rm_r TOMCAT_CORE_TARGET_DIR if File.exist?(TOMCAT_CORE_TARGET_DIR)
     rm TOMCAT_CORE_JAR if File.exist?(TOMCAT_CORE_JAR)
   end
   task :clean => :clear
-  
+
 end

data/trinidad.gemspec

@@ -22,8 +22,8 @@ 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.4.0', '< 1.6.0')
-  gem.add_dependency('jruby-rack', '~> 1.1.14')
+  gem.add_dependency('trinidad_jars', '>= 1.5', '< 1.7')
+  gem.add_dependency('jruby-rack', '>= 1.1.18', '< 1.3')
 
   gem.add_development_dependency('rspec', '~> 2.14.1')
 
@@ -38,4 +38,4 @@ Gem::Specification.new do |gem|
 
   gem.test_files = gem.files.select { |path| path =~ /^spec\/.*_spec\.rb/ }
 
-end
+end

metadata

@@ -1,63 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: trinidad
 version: !ruby/object:Gem::Version
-  version: 1.5.0.B1
+  version: 1.5.0.B2
 platform: ruby
 authors:
 - David Calavera
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: trinidad_jars
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.6.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
+        version: '1.5'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.7'
+  name: trinidad_jars
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jruby-rack
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.1.14
+        version: '1.7'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.18
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.1.14
+        version: '1.3'
+  name: jruby-rack
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 1.1.18
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
+  name: rspec
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.1
 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 !
 email: calavera@apache.org
 executables:
@@ -99,22 +105,22 @@ licenses:
 metadata: {}
 post_install_message:
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Web server for Rails/Rack applications built upon JRuby::Rack and Apache Tomcat