trinidad 1.0.5 → 1.1.0

data/History.txt

@@ -1,3 +1,18 @@
+== Trinidad 1.1.0 (2011-03-18)
+
+* Hot deployment integrated in the core gem
+* Load config/trinidad.yml by default without the `-f` option if it exists
+* Load config.ru for applications under the `apps_base` directory when the option is enabled
+* Share the JRuby runtime with JRuby-Rack
+
+== Trinidad_jars 1.0.1 (2011-03-17)
+
+* Upgrade to Tomcat 7.0.11
+
+== Trinidad_jars 1.0.0 (2011-01-18)
+
+* Upgrade to Tomcat 7.0.6, first stable release of the Tomcat 7 branch.
+
 == 1.0.5 (2011-01-13)
 
 * Fix trailing spaces on arguments. Thank you Windows.

data/README.rdoc

@@ -2,8 +2,9 @@
 
 Trinidad allows you to run a rails or rackup applications within an embedded Apache Tomcat container.
 
-Mail list: http://groups.google.com/group/rails-trinidad
-Bug tracker: http://github.com/calavera/trinidad/issues
+* Mail list: http://groups.google.com/group/rails-trinidad
+* Bug tracker: http://github.com/calavera/trinidad/issues
+* Irc channel on Freenode: #trinidad
 
 == INSTALL:
 
@@ -51,21 +52,28 @@ Trinidad allows you to configure some parameters when the server is started from
   * -g, --log LEVEL             =>  set the log level, default INFO.
   * --apps APPS_BASE_DIRECTORY  =>  set the applications base directory.
 
-The server can also be configured from a yaml file. If a file is not especified, the server tries to load the file <em>config/trinidad.yml</em>. Within this file you can add other options like jruby.min.runtimes(:jruby_min_runtimes) or jruby.max.runtimes(:jruby_max_runtimes).
+The server can also be configured from a yaml file. By default, if a file is not especified, the server tries to load the file <em>config/trinidad.yml</em>. Within this file you can add other options like jruby.min.runtimes(:jruby_min_runtimes) or jruby.max.runtimes(:jruby_max_runtimes).
 
-  jruby -S trinidad -f
   jruby -S trinidad --config my_custom_configuration.yml
 
 You can also specify a default web.xml to config your web application. By default the server tries to load the file <em>config/web.xml</em> but you can modify this path adding the option <em>default_web_xml</em> within your configuration file. 
 
 Other advanced options can be found in the wiki: http://wiki.github.com/calavera/trinidad/advanced-configuration
 
+== HOT DEPLOYMENT:
+
+Although the early versions of Trinidad used an extension to let deploy applications monitorizing a file, since Trinidad 1.1.0 this feature is
+integrated into the core. When the file `tmp/restart.txt` is modified, the server reloads the application that the file belongs. This file can be
+modified with the option `:monitor`.
+
 == EXTENSIONS:
 
 From the version 0.8.0 Trinidad allows to extend the server with more Tomcat features, here there is a list with the current available extensions:
 
 * Database connection pooling: http://github.com/calavera/trinidad-dbpool
-* Daemon, run Trinidad as a daemon: http://github.com/calavera/trinidad_daemon_extension and http://github.com/calavera/trinidad_daemon
+* Daemons:
+    ** Daemon based on Akuma (ala GF gem): http://github.com/calavera/trinidad_daemon_extension
+    ** Daemon based on Apache Commons Daemon (supports Unix and Windows systems): http://github.com/calavera/trinidad_daemon
 * Hot deploy, do hot deploys monitorizing a temporal file, ala Passenger: http://github.com/calavera/trinidad_hotdeploy_extension
 * Sandbox, management console and REST api: http://github.com/calavera/trinidad_sandbox_extension
 * Logging, enhance the Trinidad's logging system: http://github.com/calavera/trinidad_logging_extension

data/bin/trinidad

@@ -1,8 +1,5 @@
 #!/usr/bin/env jruby
 
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-$:.unshift(File.dirname(__FILE__) + '/../trinidad-libs')
-
 require "trinidad"
 
 opts = Trinidad::CommandLineParser.parse(ARGV)

data/lib/trinidad.rb

@@ -1,11 +1,7 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-require "java"
+require 'java'
 require 'rubygems'
 
 require 'jruby-rack'
-require JRubyJars.jruby_rack_jar_path
 
 gem 'trinidad_jars'
 
@@ -15,6 +11,7 @@ require 'trinidad/extensions'
 require 'trinidad/command_line_parser'
 require 'trinidad/jars'
 require 'trinidad/server'
+require 'trinidad/lifecycle/lifecycle_listener_host'
 require 'trinidad/lifecycle/lifecycle_listener_base'
 require 'trinidad/lifecycle/lifecycle_listener_default'
 require 'trinidad/lifecycle/lifecycle_listener_war'
@@ -24,5 +21,5 @@ require 'trinidad/rackup_web_app'
 require 'trinidad/war_web_app'
 
 module Trinidad
-  VERSION = '1.0.5'
+  VERSION = '1.1.0'
 end

data/lib/trinidad/command_line_parser.rb

@@ -1,6 +1,5 @@
 module Trinidad
   require 'optparse'
-  require 'yaml'
 
   class CommandLineParser
     attr_reader :default_options
@@ -17,7 +16,8 @@ module Trinidad
         :libs_dir => 'lib',
         :classes_dir => 'classes',
         :ssl_port => 8443,
-        :ajp_port => 8009
+        :ajp_port => 8009,
+        :config => 'config/trinidad.yml'
       }
     end
 
@@ -30,10 +30,13 @@ module Trinidad
       end
 
       if default_options.has_key?(:config)
+        require 'yaml'
         default_options[:config] = File.expand_path(default_options[:config], default_options[:web_app_dir] || Dir.pwd)
 
-        config_options = YAML.load_file(default_options[:config])
-        default_options.deep_merge!(config_options.symbolize!)
+        if File.exist?(default_options[:config])
+          config_options = YAML.load_file(default_options[:config])
+          default_options.deep_merge!(config_options.symbolize!)
+        end
       end
 
       default_options
@@ -88,15 +91,7 @@ module Trinidad
 
         opts.on('-f', '--config [CONFIG_FILE]', 'Configuration file',
             "default: #{default_options[:config]}") do |file|
-          default_options[:config] = 'config/trinidad.yml'
-
-          if file
-            default_options[:config] = file
-          elsif File.exist?('config/tomcat.yml') && !File.exist?(default_options[:config])
-            puts "[WARNING] Default configuration file name has been moved to trinidad.yml, tomcat.yml will not be supported in future versions."
-            puts "\tYou still can use tomcat.yml passing it as the file name to this option: -f config/tomcat.yml"
-            default_options[:config] = 'config/tomcat.yml'
-          end
+          default_options[:config] = file unless file.nil?
         end
 
         opts.on('-r', '--rackup [RACKUP_FILE]', 'Rackup configuration file',

data/lib/trinidad/lifecycle/lifecycle_listener_base.rb

@@ -2,6 +2,7 @@ module Trinidad
   module Lifecycle
     class Base
       include Trinidad::Tomcat::LifecycleListener
+      attr_reader :webapp
 
       def initialize(webapp)
         @webapp = webapp
@@ -17,9 +18,16 @@ module Trinidad
 
       def configure_defaults(context)
         remove_defaults(context)
+        configure_context_runtime(context)
         configure_logging
       end
 
+      def configure_context_runtime(context)
+        if @webapp.solo? && @webapp.threadsafe?
+          context.servlet_context.set_attribute('jruby.runtime', JRuby.runtime)
+        end
+      end
+
       def remove_defaults(context)
         context.remove_welcome_file('index.jsp')
         context.remove_welcome_file('index.htm')

data/lib/trinidad/lifecycle/lifecycle_listener_host.rb

@@ -0,0 +1,49 @@
+module Trinidad
+  module Lifecycle
+    class Host
+      include Trinidad::Tomcat::LifecycleListener
+
+      attr_reader :contexts
+
+      def initialize(*contexts)
+        @contexts = contexts
+      end
+
+      def lifecycleEvent(event)
+        host = event.lifecycle
+        case event.type
+        when Trinidad::Tomcat::Lifecycle::BEFORE_START_EVENT
+          init_monitors
+        when Trinidad::Tomcat::Lifecycle::PERIODIC_EVENT
+          check_monitors
+        end
+      end
+
+      def init_monitors
+        @contexts.each do |c|
+          monitor = c[:monitor]
+          opts = File.exist?(monitor) ? 'r' : 'w+'
+
+          unless File.exist?(dir = File.dirname(monitor))
+            Dir.mkdir dir
+          end
+          file = File.new(monitor, opts)
+          c[:mtime] = file.mtime
+        end
+      end
+
+      def check_monitors
+        @contexts.each do |c|
+          # double check monitor, capistrano removes it temporarily
+          sleep(0.5) unless File.exist?(c[:monitor])
+          next unless File.exist?(c[:monitor])
+
+          if (mtime = File.mtime(c[:monitor])) > c[:mtime]
+            c[:mtime] = mtime
+            c[:context].reload
+          end
+        end
+      end
+    end
+  end
+end

data/lib/trinidad/server.rb

@@ -21,7 +21,8 @@ module Trinidad
     def initialize(config = {})
       load_config(config)
       load_tomcat_server
-      create_web_apps
+      apps = create_web_apps
+      load_host_monitor(apps)
     end
 
     def load_config(config)
@@ -46,13 +47,20 @@ module Trinidad
     end
 
     def create_web_apps
-      create_from_web_apps
-      create_from_apps_base
+      apps = []
+      apps << create_from_web_apps
+      apps << create_from_apps_base
+
+      apps.flatten.compact
+    end
+
+    def load_host_monitor(apps)
+      @tomcat.host.add_lifecycle_listener(Trinidad::Lifecycle::Host.new(*apps))
     end
 
     def create_from_web_apps
       if @config[:web_apps]
-        @config[:web_apps].each do |name, app_config|
+        @config[:web_apps].map do |name, app_config|
           app_config[:context_path] ||= (name.to_s == 'default' ? '' : "/#{name.to_s}")
           app_config[:web_app_dir] ||= Dir.pwd
 
@@ -68,13 +76,16 @@ module Trinidad
 
         apps_path.reject! {|path| apps_path.include?(path + '.war') }
 
-        apps_path.each do |path|
+        apps_path.map do |path|
           if (File.directory?(path) || path =~ /\.war$/)
             name = File.basename(path)
             app_config = {
               :context_path => (name == 'default' ? '' : "/#{name.to_s}"),
               :web_app_dir => File.expand_path(path)
             }
+            if File.directory?(path) && File.exist?(File.expand_path('config.ru', path))
+              app_config[:rackup] = 'config.ru'
+            end
 
             create_web_app(app_config)
           end
@@ -91,6 +102,8 @@ module Trinidad
 
       lifecycle = web_app.war? ? Lifecycle::War.new(web_app) : Lifecycle::Default.new(web_app)
       app_context.add_lifecycle_listener(lifecycle)
+
+      {:context => app_context, :monitor => web_app.monitor}
     end
 
     def add_service_connector(options, protocol = nil)
@@ -192,7 +205,8 @@ module Trinidad
         default_app = {
           :context_path => config[:context_path],
           :web_app_dir => config[:web_app_dir] || Dir.pwd,
-          :log => config[:log]
+          :log => config[:log],
+          :solo => true
         }
         default_app[:rackup] = config[:rackup] if (config.has_key?(:rackup))
 

data/lib/trinidad/war_web_app.rb

@@ -7,5 +7,9 @@ module Trinidad
     def work_dir
       File.join(web_app_dir.gsub(/\.war$/, ''), 'WEB-INF')
     end
+
+    def monitor
+      File.expand_path(web_app_dir)
+    end
   end
 end

data/lib/trinidad/web_app.rb

@@ -83,6 +83,19 @@ module Trinidad
     def work_dir; web_app_dir; end
     def environment; @app_config[:environment] || @config[:environment] || 'development'; end
 
+    def solo?
+      !self.is_a?(WarWebApp) && @app_config[:solo]
+    end
+
+    def threadsafe?
+      jruby_min_runtimes.to_i == 1 && jruby_max_runtimes.to_i == 1
+    end
+
+    def monitor
+      m_file = @app_config[:monitor] || @config[:monitor] || 'tmp/restart.txt'
+      File.expand_path(m_file, work_dir)
+    end
+
     protected
     def add_parameter_unless_exist(param_name, param_value)
       @params[param_name] = param_value unless web_context_param(param_name)

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: trinidad
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 1
-    - 0
-    - 5
-  version: 1.0.5
+  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors: 
   - David Calavera
@@ -14,46 +10,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 +01:00
+date: 2011-03-18 00:00:00 -07:00
 default_executable: trinidad
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: trinidad_jars
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 3
-              - 0
-            version: 0.3.0
+            version: 1.0.0
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
     name: jruby-rack
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 0
-              - 2
-            version: 1.0.2
+            version: 1.0.6
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
     name: rspec
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
     type: :development
     version_requirements: *id003
@@ -61,11 +50,10 @@ dependencies:
     name: mocha
     prerelease: false
     requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
     type: :development
     version_requirements: *id004
@@ -73,11 +61,10 @@ dependencies:
     name: fakefs
     prerelease: false
     requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
     type: :development
     version_requirements: *id005
@@ -106,6 +93,7 @@ files:
   - lib/trinidad/web_app.rb
   - lib/trinidad/lifecycle/lifecycle_listener_base.rb
   - lib/trinidad/lifecycle/lifecycle_listener_default.rb
+  - lib/trinidad/lifecycle/lifecycle_listener_host.rb
   - lib/trinidad/lifecycle/lifecycle_listener_war.rb
 has_rdoc: true
 homepage: http://github.com/calavera/trinidad
@@ -117,23 +105,21 @@ rdoc_options:
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 requirements: []
 
 rubyforge_project: trinidad
-rubygems_version: 1.3.6
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 2
 summary: Simple library to run rails applications into an embedded Tomcat