trinidad 1.4.6 → 1.5.0.B1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4324c8a8dacc58bba855257ddfc1296159002490
-  data.tar.gz: 4bbedc68ed6ac2515163b9a43d200f1f61de181d
+  metadata.gz: f9f931542c2c97ff175af70b7cfa4d7aa032c645
+  data.tar.gz: f55ee60e3b061ea7a91889e9ed1e9438581f3091
 SHA512:
-  metadata.gz: 34e0a3221d65521854cd6dc9d51b05b3b22ec1591f920f130ea15da93d4a1903b598826567921d390224d424a6542d54e45785a335661a4f2ffa80496b766386
-  data.tar.gz: 79466df8eb49615db97e4381d7b185501001edce145d6eb122366444380da3073bcb6dcdff8ebd2103cef46824f3b3fd18ba18f8bb682f97e5eaeb101bc99561
+  metadata.gz: 03cc89e6b175adbd918d099ed5224edca53e4cdb8bc8ee0d45276cf171e473bb0c09086930340201cf9f7aeb4ede770d7f34564c7a6bdf330d2758f8f78f5888
+  data.tar.gz: 66b2f839079014480fd298cfd6c3798909449fa6a3ee281bb45e3c37678407fd8e863ac2df08225756c4e6c4cb16cf4ede87be6dc0aac6e8461a4bf4df9b05eb

data/Gemfile

@@ -13,10 +13,29 @@ if (jars = ENV['trinidad_jars']) && jars != 'false'
   end
 end
 
-gem 'sinatra', :require => nil, :group => :test
+gem 'rake', '< 10.2.0', :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_
+
+  if jruby_rack_version = ENV['JRUBY_RACK_VERSION']
+    gem 'jruby-rack', jruby_rack_version, :require => false
+  end
+end
 
 group :integration do
-  gem "rails", "~> 3.2.16"
-  gem "jruby-openssl" if JRUBY_VERSION < '1.7.0'
+  if sinatra_version = ENV['SINATRA_VERSION']
+    gem 'sinatra', sinatra_version, :require => nil, :group => :test
+  else
+    gem 'sinatra', :require => nil, :group => :test
+  end
+  if rails_version = ENV['RAILS_VERSION']
+    gem 'rails', rails_version, :require => nil, :group => :test
+  else
+    gem 'rails', :require => nil, :group => :test
+  end
+  gem 'jruby-openssl' if JRUBY_VERSION < '1.7.0'
   # eval(File.read("spec/integration/rails32/Gemfile"), binding)
 end

data/LICENSE

@@ -1,6 +1,6 @@
 == Trinidad
 
-Copyright (c) 2013 Team Trinidad and contributors http://github.com/trinidad
+Copyright (c) 2014 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

data/README.md

@@ -1,23 +1,25 @@
 # Trinidad
 
-Trinidad allows you to run Rails and/or Rack applications within an embedded 
+Trinidad allows you to run Rails and/or Rack applications within an embedded
 Tomcat container. Apache Tomcat (formerly also Jakarta Tomcat) is an open source
-web server and Servlet container with a long history that dates back to the 
+web server and Servlet container with a long history that dates back to the
 previous millenia.
 
 Trinidad's goals with bringing Tomcat into JRuby land are mostly the following :
 
-- **flexibility** especially in terms of configuration it allows you to tune 
+- **flexibility** especially in terms of configuration it allows you to tune
   (almost) everything from a simple *trinidad.yml* (or .rb) configuration file
 - **portability** there's no vendor lock-in as we use `JRuby::Rack`, thus even
-  if you do some Java integration or use it's Rack Servlet extensions you're 
+  if you do some Java integration or use it's Rack Servlet extensions you're
   still able to migrate to a standalone Tomcat or any other Servlet container
 - easy Java integration (just in-case you need it, it's there)
-- **extensions** such as connection pooling (sharing pools between deployed 
+- **extensions** such as connection pooling (sharing pools between deployed
   Rails apps) and (threaded) worker adapters for `Resque` and `Delayed::Job`
 
 ## Installation
 
+[![gem version](https://badge.fury.io/rb/trinidad.png)](http://rubygems.org/gems/trinidad)
+
 ```
 $ jruby -S gem install trinidad
 ```
@@ -44,8 +46,8 @@ 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 
+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.
 
 ```
@@ -104,20 +106,20 @@ 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 do 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 
+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.
 
 ## Configuration
 
-Trinidad allows you to configure parameters from the command line, the following 
+Trinidad allows you to configure parameters from the command line, the following
 is a list of the currently supported options (try `trinidad -h`):
 
 ```
@@ -141,18 +143,18 @@ is a list of the currently supported options (try `trinidad -h`):
   * -g, --log LEVEL               =>  set logging level
 ```
 
-You can also specify a default *web.xml* to configure your web application. 
+You can also specify a default *web.xml* to configure your web application.
 By default the server tries to load the file *config/web.xml* but you can change
 the path by adding the option `default_web_xml` within your configuration file.
 
 ### YAML Configuration
 
-The server can be configured from a .yml file. By default, if a file is 
+The server can be configured from a .yml file. By default, if a file is
 not specified, the server tries to load **config/trinidad.yml**.
-Within this file you can specify options available on the command line and tune 
+Within this file you can specify options available on the command line and tune
 server settings or configure multiple applications to be hosted on the server.
 
-Advanced configuration options are explained in the wiki: 
+Advanced configuration options are explained in the wiki:
 http://wiki.github.com/trinidad/trinidad/advanced-configuration
 
 
@@ -168,8 +170,8 @@ $ jruby -S trinidad --config my_trinidad.yml
 
 ### Ruby Configuration
 
-As an alternative to the *config/trinidad.yml* file, a .rb configuration file 
-might be used to setup Trinidad. It follows the same convention as the YAML 
+As an alternative to the *config/trinidad.yml* file, a .rb configuration file
+might be used to setup Trinidad. It follows the same convention as the YAML
 configuration - the file **config/trinidad.rb** is loaded by default if exists.
 
 ```ruby
@@ -193,41 +195,41 @@ Context with name [/] has started rolling
 Context with name [/] has completed rolling
 ```
 
-It also prints warnings and error messages on error output, while application 
+It also prints warnings and error messages on error output, while application
 specific log messages (e.g. logs from `Rails.logger`) always go into the expected
-file location at *log/{environment}.log*. 
+file location at *log/{environment}.log*.
 
-Application logging performs daily file rolling out of the box and only prints 
+Application logging performs daily file rolling out of the box and only prints
 messages to the console while it runs in development mode, that means you won't
 see any application specific output on the console say in production !
 
-Please note that these logging details as well as the logging format will be 
+Please note that these logging details as well as the logging format will be
 configurable with *trinidad.yml/.rb* within the next **1.4.x** release.
 
-If you plan to use a slice of Java with your JRuby and require a logger, consider 
-using `ServletContext#log`. By default it is setup in a way that logging with 
-`ServletContext` ends up in the same location as the Rails log. 
+If you plan to use a slice of Java with your JRuby and require a logger, consider
+using `ServletContext#log`. By default it is setup in a way that logging with
+`ServletContext` ends up in the same location as the Rails log.
 If this is not enough you can still configure a Java logging library e.g. SLF4J,
-just make sure you tell Trinidad to use it as well, if needed, using the 
+just make sure you tell Trinidad to use it as well, if needed, using the
 **jruby.rack.logging** context parameter in *web.xml*.
 
 ### Context Configuration
 
-For slightly advanced (and "dirty" XML :)) application configuration Trinidad 
-also supports the exact same *context.xml* format as Tomcat. Each web app is 
-represented as a context instance and might be configured as such. You do not 
-need to repeat configuring the same parameters you have already setup with the 
-Trinidad configuration. This is meant to be mostly for those familiar with 
+For slightly advanced (and "dirty" XML :)) application configuration Trinidad
+also supports the exact same *context.xml* format as Tomcat. Each web app is
+represented as a context instance and might be configured as such. You do not
+need to repeat configuring the same parameters you have already setup with the
+Trinidad configuration. This is meant to be mostly for those familiar with
 Tomcat internals.
-Currently the application's *context.xml* is expected to be located on the 
+Currently the application's *context.xml* is expected to be located on the
 class-path under your *[classes]/META-INF* directory.
 
 Context Doc: http://tomcat.apache.org/tomcat-7.0-doc/config/context.html
 
 ### Serving Assets
 
-Trinidad uses Tomcat's built-in capabilities to server your public files. 
-We do recommend compiling assets up front and disabling the asset server (in 
+Trinidad uses Tomcat's built-in capabilities to server your public files.
+We do recommend compiling assets up front and disabling the asset server (in
 production) if you're using the asset pipeline in a Rails application.
 If you do not put a web-server such as Apache in front of Trinidad you might
 want to configure the resource caching (on by default for env != development)
@@ -235,7 +237,7 @@ for maximum performance e.g. by default it's configured as follows :
 
 ```yml
 ---
-  public: 
+  public:
     root: public # same as the above "public: public" setting
     cached: true # enable (in-memory) asset caching on for env != 'development'
     cache_ttl: 5000 # cache TTL in millis (might want to increase this)
@@ -245,37 +247,48 @@ for maximum performance e.g. by default it's configured as follows :
       #/home: /var/local/www
 ```
 
-Note that this configuration applies to (server-side) resource caching on top 
-of the "public" file-system. You do not need to worry about client side caching, 
+Note that this configuration applies to (server-side) resource caching on top
+of the "public" file-system. You do not need to worry about client side caching,
 it is handled out of the box with *ETag* and *Last-Modified* headers being set.
 
 You might also "mount" file-system directories as aliases to your resources
 root to be served by your application (as if they were in the public folder).
 
-**NOTE:** In development mode if you ever happen to `rake assets:precompile` 
+**NOTE:** In development mode if you ever happen to `rake assets:precompile`
 make sure to remove your *public/assets* directory later, otherwise requests
 such as **/assets/application.js?body=1.0** might not hit the Rails runtime.
 
 ## Hot Deployment
 
-Trinidad supports monitoring a file to reload applications, when the file 
-*tmp/restart.txt* is updated (e.g. `touch tmp/restart.txt`), the server reloads 
-the application the monitor file belongs to. 
+Trinidad supports monitoring a file to reload applications, when the file
+*tmp/restart.txt* is updated (e.g. `touch tmp/restart.txt` on Unix or
+`type nul >>tmp\restart.txt & copy /b tmp\restart.txt +,,` on Windows),
+the server reloads the application the monitor file belongs to.
 This monitor file can be customized with the `monitor` configuration option.
 
 Since version **1.4.0** Trinidad supports 2 reload strategies :
 
-* **restart** (default) synchronous reloading (exposed by Tomcat). This strategy
-  pauses incoming requests while it reloads the application and then serves them
-  once ready (or timeouts if it takes too long). It has been chosen as the default
-  strategy since **1.4.0** due it's more predictable memory requirements.
+* **restart** (default) synchronous reloading. This strategy pauses incoming
+  requests while it reloads the application and then serves them once ready
+  (or timeouts if it takes too long). It is the default strategy since **1.4.0**
+  due it's more predictable memory requirements.
 
-* **rolling** "zero-downtime" (asynchronous) reloading strategy similar to 
+* **rolling** a.k.a. "zero-downtime" (asynchronous) reloading strategy similar to
   Passenger's rolling reloads. This has been the default since **1.1.0** up till
   the **1.3.x** line. If you use this you should account that your JVM memory
   requirements might increase quite a lot (esp. if you reload under heavy loads)
   since requests are being served while there's another version of the
-  application being loaded. Since version **1.4.5** rolling reloads support ....
+  application being loaded.
+
+**NOTE:** due the way class-loaders where setup internally, Trinidad might have
+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) :
+```
+JRUBY_OPTS="$JRUBY_OPTS -J-XX:+UseConcMarkSweepGC -J-XX:+CMSClassUnloadingEnabled"
+```
 
 Configure the reload strategy per web application or globally e.g. :
 
@@ -288,11 +301,11 @@ Configure the reload strategy per web application or globally e.g. :
 
 ## Virtual Hosts
 
-It's possible to use Trinidad with multiple hosts and load the applications under 
+It's possible to use Trinidad with multiple hosts and load the applications under
 them automatically. A (virtual) host represents an association of a network name
 (such as "www.example.com" with the particular server on which Tomcat is running.
 Please remember that each host must have its applications in a different directory.
-You can find out more at Tomcat's [documentation][5].
+You can find out more at Tomcat's [documentation][4].
 
 ```ruby
 Trinidad.configure do |config|
@@ -306,7 +319,7 @@ Trinidad.configure do |config|
 end
 ```
 
-Detailed host configuration is also possible using supported [host options][5] :
+Detailed host configuration is also possible using supported [host options][4] :
 
 ```yaml
 ---
@@ -318,10 +331,10 @@ Detailed host configuration is also possible using supported [host options][5] :
       unpackWARs: true
 ```
 
-If applications are configured via the `web_apps` section, the host for each 
-application can be added with the `host` (or `hosts`) key, if a specified host 
+If applications are configured via the `web_apps` section, the host for each
+application can be added with the `host` (or `hosts`) key, if a specified host
 does not exists (e.g. not configured or not "localhost") it will be created.
-If several applications belong to the same host, they are expected to reside 
+If several applications belong to the same host, they are expected to reside
 under the same parent directory e.g. :
 
 ```ruby
@@ -345,7 +358,7 @@ end
 
 ## Extensions
 
-Trinidad allows to extend itself with more (not just Tomcat) features using 
+Trinidad allows to extend itself with more (not just Tomcat) features using
 extensions, they're essentially components hooked into Tomcat's life-cycle.
 Here is a list of the available extensions that are "officially supported" :
 
@@ -357,7 +370,7 @@ Here is a list of the available extensions that are "officially supported" :
   http://github.com/trinidad/trinidad_init_services
 * Scheduler, based on Quartz :
   http://github.com/trinidad/trinidad_scheduler_extension
-* Worker, threaded workers (supports Resque, Delayed::Job) : 
+* Worker, threaded workers (supports Resque, Delayed::Job) :
   http://github.com/trinidad/trinidad_worker_extension
 * Logging, enhance Trinidad's logging system :
   http://github.com/trinidad/trinidad_logging_extension
@@ -365,30 +378,29 @@ Here is a list of the available extensions that are "officially supported" :
   http://github.com/trinidad/trinidad_lifecycle_extension
 * Valves - components inserted into the request pipeline (e.g. Access Log) :
   http://github.com/trinidad/trinidad_valve_extension
-* Trinidad's Management Console and REST API :
-  http://github.com/trinidad/trinidad_sandbox_extension
+* Application/Deployment Monitoring based on PSI-Probe :
+  http://github.com/trinidad/trinidad_probe_extension
 * Enable remote JMX monitoring capabilities for Trinidad :
   http://github.com/trinidad/trinidad_jmx_remote_extension
 
-You can find further information on how to write extensions in the [wiki][4].
+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
-* [Engine Yard][2] has PaaS cloud support with JRuby and Trinidad
 * Mailing List: http://groups.google.com/group/rails-trinidad
-* Bug Tracker: http://github.com/trinidad/trinidad/issues
+* Bug Tracker: https://github.com/trinidad/trinidad/issues
 * IRC [Channel on FreeNode][3]: #trinidad (or ask in #jruby)
 
 ## Copyright
 
-Copyright (c) 2013 [Team Trinidad](https://github.com/trinidad). 
+Copyright (c) 2014 [Team Trinidad](https://github.com/trinidad).
 See LICENSE (http://en.wikipedia.org/wiki/MIT_License) for details.
 
-[0]: http://github.com/kares
+[0]: http://kares.org
 [1]: http://logichaus.com/jruby.html
-[2]: https://www.engineyard.com/blog/2011/leveraging-trinidad-and-jruby-on-appcloud/
-[3]: http://webchat.freenode.net/?channels=trinidad
-[4]: http://github.com/trinidad/trinidad/wiki/extensions
-[5]: http://tomcat.apache.org/tomcat-7.0-doc/config/host.html
+[3]: http://webchat.freenode.net/?channels=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

@@ -9,7 +9,8 @@ task :default => :spec
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.rspec_opts = ['--color', "--format documentation"]
+  spec.rspec_opts = ['--color']
+  spec.rspec_opts << '--format documentation' if ENV['CI'] == 'true'
 end
 
 desc "Remove all build artifacts"
@@ -46,14 +47,17 @@ TOMCAT_CORE_JAR = File.expand_path('../trinidad-libs/tomcat-core.jar', __FILE__)
 TRINIDAD_RB_JAR = File.expand_path('../trinidad-libs/trinidad-rb.jar', __FILE__)
 
 module TrinidadRakeHelpers
-  
+
   def javac(source_dir, target_dir, class_path = TOMCAT_CORE_JAR)
+    source = '1.6'; target = '1.6' # java-compiler settings
     FileUtils.mkdir target_dir unless File.exist?(target_dir)
-    sh 'javac -Xlint:deprecation -Xlint:unchecked -g -source 1.6 -target 1.6 ' + 
-       "-classpath #{class_path} -d #{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} " <<
        Dir["#{source_dir}/**/*.java"].join(" ")
   end
-  
+
   def jar(entries, jar_path)
     work_dir = Dir.pwd
     if entries.is_a?(String) && File.directory?(entries)
@@ -67,36 +71,36 @@ module TrinidadRakeHelpers
       %x{jar #{options} #{jar_path} #{entries.join(' ')}}
     end
   end
-  
-  def log(msg)
-    puts msg
-  end
-  
+
+  def log(msg); puts msg end
+
 end
 
 namespace :'trinidad-rb' do
   include TrinidadRakeHelpers
-  
+
   TRINIDAD_RB_TARGET_DIR = File.expand_path('../target/trinidad-rb', __FILE__)
-  
+
   desc "Compile trinidad-rb java sources"
   task :compile do
-    javac "src/trinidad-rb/java", TRINIDAD_RB_TARGET_DIR
+    require 'jruby-jars'
+    class_path = [ TOMCAT_CORE_JAR, JRubyJars.core_jar_path ]
+    javac "src/trinidad-rb/java", TRINIDAD_RB_TARGET_DIR, class_path
   end
-  
+
   desc "Package trinidad-rb.jar"
   task :jar => :compile do
     rm TRINIDAD_RB_JAR if File.exist?(TRINIDAD_RB_JAR)
     jar TRINIDAD_RB_TARGET_DIR, TRINIDAD_RB_JAR
   end
-  
+
   desc "Remove trinidad-rb.jar"
   task :clear do
     rm_r TRINIDAD_RB_TARGET_DIR if File.exist?(TRINIDAD_RB_TARGET_DIR)
     rm TRINIDAD_RB_JAR if File.exist?(TRINIDAD_RB_JAR)
   end
   task :clean => :clear
-  
+
 end
 
 task :build   => 'trinidad:build'