trinidad 0.9.10 → 0.9.11

data/History.txt

@@ -1,3 +1,11 @@
+== 0.9.11 (2010-10-20)
+
+* configure applications base directory to run several applications into the same container
+
+== 0.9.10 (2010-10-02)
+
+* configure logging as expected by rails applications
+
 == 0.9.9 (2010-09-29)
 
 * set tomcat's server address properly

data/README.rdoc

@@ -48,6 +48,8 @@ Trinidad allows you to configure some parameters when the server is started from
   * -t, --threadsafe            =>  shortcut to work in threadsafe mode. Setting jruby_min_runtimes and jruby_max_runtimes to 1 in the configuration file the server behaves as the same way.
   * -l, --load EXTENSION_NAME   =>  load an extension to use its command line options.
   * --address HOST              =>  set the server host.
+  * -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).
 
@@ -63,10 +65,11 @@ Other advanced options can be found in the wiki: http://wiki.github.com/calavera
 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
+* Daemon, run Trinidad as a daemon: http://github.com/calavera/trinidad_daemon_extension and 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
+* Lifecycle, application and server lifecycle management: http://github.com/calavera/trinidad_lifecycle_extension
 
 You can find further information on how to write your own extension in the wiki: http://wiki.github.com/calavera/trinidad/extensions
 

data/lib/trinidad/command_line_parser.rb

@@ -47,28 +47,28 @@ module Trinidad
           default_options[:web_app_dir] = v
         end
 
-        opts.on('-e', '--env ENVIRONMENT', 'Rails environment', 
-            "default: #{default_options[:environment]}") do |v| 
+        opts.on('-e', '--env ENVIRONMENT', 'Rails environment',
+            "default: #{default_options[:environment]}") do |v|
           default_options[:environment] = v
         end
 
-        opts.on('-p', '--port PORT', 'Port to bind to', 
-            "default: #{default_options[:port]}") do |v| 
+        opts.on('-p', '--port PORT', 'Port to bind to',
+            "default: #{default_options[:port]}") do |v|
           default_options[:port] = v
         end
 
-        opts.on('-c', '--context CONTEXT_PATH', 'The application context path', 
-            "default: #{default_options[:context_path]}") do |v| 
+        opts.on('-c', '--context CONTEXT_PATH', 'The application context path',
+            "default: #{default_options[:context_path]}") do |v|
           default_options[:context_path] = v
         end
 
-        opts.on('--lib', '--jars LIBS_DIR', 'Directory containing jars used by the application', 
-            "default: #{default_options[:libs_dir]}") do |v| 
+        opts.on('--lib', '--jars LIBS_DIR', 'Directory containing jars used by the application',
+            "default: #{default_options[:libs_dir]}") do |v|
           default_options[:libs_dir] = v
         end
 
-        opts.on('--classes', '--classes CLASSES_DIR', 'Directory containing classes used by the application', 
-            "default: #{default_options[:classes_dir]}") do |v| 
+        opts.on('--classes', '--classes CLASSES_DIR', 'Directory containing classes used by the application',
+            "default: #{default_options[:classes_dir]}") do |v|
           default_options[:classes_dir] = v
         end
 
@@ -81,7 +81,7 @@ module Trinidad
         opts.on('-a', '--ajp [AJP_PORT]', 'Enable ajp connections',
             "default port: #{default_options[:ajp_port]}") do |v|
           ajp_port = v.nil? ? default_options.delete(:ajp_port) : v.to_i
-          default_options[:ajp] = {:port => ajp_port} 
+          default_options[:ajp] = {:port => ajp_port}
         end
 
         opts.on('-f', '--config [CONFIG_FILE]', 'Configuration file',
@@ -128,6 +128,10 @@ module Trinidad
           Trinidad::Extensions.configure_options_extensions({name => {}}, opts, default_options)
         end
 
+        opts.on('--apps', '--apps APPS_BASE_DIR', 'applications base directory') do |path|
+          default_options[:apps_base] = path
+        end
+
         opts.on('-h', '--help', 'display the help') do
           puts opts
           exit

data/lib/trinidad/server.rb

@@ -35,7 +35,7 @@ module Trinidad
       @tomcat.server.address = @config[:address]
       @tomcat.port = @config[:port].to_i
       @tomcat.base_dir = Dir.pwd
-      @tomcat.host.app_base = Dir.pwd
+      @tomcat.host.app_base = @config[:apps_base] || Dir.pwd
       @tomcat.enable_naming
 
       add_http_connector if http_configured?
@@ -46,10 +46,32 @@ module Trinidad
     end
 
     def create_web_apps
-      @config[:web_apps].each do |name, app_config|
-        app_config[:context_path] ||= (name.to_s == 'default' ? '/' : "/#{name.to_s}")
-        app_config[:web_app_dir] ||= Dir.pwd
+      if @config[:web_apps]
+        @config[:web_apps].each do |name, app_config|
+          app_config[:context_path] ||= (name.to_s == 'default' ? '/' : "/#{name.to_s}")
+          app_config[:web_app_dir] ||= Dir.pwd
 
+          create_web_app(app_config)
+        end
+      end
+      if @config[:apps_base]
+        apps_path = Dir.glob(File.join(@config[:apps_base], '*')).select {|path| !(path =~ /tomcat\.8080$/) }
+
+        apps_path.each do |path|
+          if File.directory?(path)
+            name = File.basename(path)
+            app_config = {
+              :context_path => (name == 'default' ? '/' : "/#{name.to_s}"),
+              :web_app_dir => File.expand_path(path)
+            }
+
+            create_web_app(app_config)
+          end
+        end
+      end
+    end
+
+    def create_web_app(app_config)
         app_context = @tomcat.addWebapp(app_config[:context_path], app_config[:web_app_dir])
         remove_defaults(app_context)
 
@@ -58,7 +80,6 @@ module Trinidad
 
         Trinidad::Extensions.configure_webapp_extensions(web_app.extensions, @tomcat, app_context)
         app_context.add_lifecycle_listener(WebAppLifecycleListener.new(web_app))
-      end
     end
 
     def add_service_connector(options, protocol = nil)
@@ -86,7 +107,7 @@ module Trinidad
 
     def add_ssl_connector
       options = @config[:ssl].merge({
-        :scheme => 'https', 
+        :scheme => 'https',
         :secure => true,
         :SSLEnabled => 'true'
       })
@@ -131,12 +152,12 @@ module Trinidad
           raise "Unable to create keystore folder: " + keystore_file.parent_file.canonical_path
       end
 
-      keytool_args = ["-genkey", 
-        "-alias", "localhost", 
-        "-dname", "CN=localhost, OU=Trinidad, O=Trinidad, C=ES", 
+      keytool_args = ["-genkey",
+        "-alias", "localhost",
+        "-dname", "CN=localhost, OU=Trinidad, O=Trinidad, C=ES",
         "-keyalg", "RSA",
-        "-validity", "365", 
-        "-storepass", "key", 
+        "-validity", "365",
+        "-storepass", "key",
         "-keystore", config[:keystoreFile],
         "-storepass", config[:keystorePass],
         "-keypass", config[:keystorePass]]
@@ -152,7 +173,7 @@ module Trinidad
     private
 
     def add_default_web_app!(config)
-      unless (config.has_key?(:web_apps))
+      if (!config.has_key?(:web_apps) && !config.has_key?(:apps_base))
         default_app = {
           :context_path => config[:context_path] || '/',
           :web_app_dir => config[:web_app_dir] || Dir.pwd,

data/lib/trinidad/web_app.rb

@@ -48,7 +48,7 @@ module Trinidad
       @app_config[:public]  || @config[:public] || 'public'
     end
 
-    %w{web_app_dir libs_dir classes_dir default_web_xml environment 
+    %w{web_app_dir libs_dir classes_dir default_web_xml environment
         jruby_min_runtimes jruby_max_runtimes rackup log}.each do |method_name|
       define_method method_name do
         sym = method_name.to_sym

data/lib/trinidad.rb

@@ -22,5 +22,5 @@ require 'trinidad/rackup_web_app'
 
 
 module Trinidad
-  VERSION = '0.9.10'
+  VERSION = '0.9.11'
 end

metadata

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