jetty-rails 0.5 → 0.6

data/History.txt

@@ -1,3 +1,12 @@
+== 0.6
+* load all java classes inside classes/ by default
+* command line args to customize lib/ and classes/ directories
+* -v showing jetty_rails version
+* each web application context has its own classloader (isolated classpaths)
+* upgraded to jruby-rack-0.9.2 (no more views being cached in development time)
+* minor changes and refactorings
+* improved docs for multi-server support
+
 == 0.5
 * load all jars inside lib/ by default
 * using GEM_PATH environment variable, if exists

data/Manifest.txt

@@ -4,6 +4,7 @@ Manifest.txt
 PostInstall.txt
 README.txt
 Rakefile
+TODO.txt
 bin/jetty_merb
 bin/jetty_rails
 config/hoe.rb
@@ -12,26 +13,37 @@ lib/jetty-6.1.9.jar
 lib/jetty-plus-6.1.9.jar
 lib/jetty-util-6.1.9.jar
 lib/jetty_rails.rb
+lib/jetty_rails/adapters/abstract_adapter.rb
 lib/jetty_rails/adapters/merb_adapter.rb
 lib/jetty_rails/adapters/rails_adapter.rb
+lib/jetty_rails/config/command_line_reader.rb
+lib/jetty_rails/config/rdoc_fix.rb
 lib/jetty_rails/handler/delegate_on_errors_handler.rb
+lib/jetty_rails/handler/public_directory_handler.rb
+lib/jetty_rails/handler/web_app_handler.rb
 lib/jetty_rails/jars.rb
 lib/jetty_rails/runner.rb
+lib/jetty_rails/server.rb
 lib/jetty_rails/version.rb
-lib/jruby-rack-0.9.jar
+lib/jetty_rails/warbler_reader.rb
+lib/jruby-rack-0.9.2.jar
 lib/servlet-api-2.5-6.1.9.jar
 script/console
 script/destroy
 script/generate
 script/txt2html
 setup.rb
+spec/config.yml
 spec/jetty_merb_spec.rb
+spec/jetty_rails/config_file_spec.rb
 spec/jetty_rails/handler/delegate_on_errors_handler_spec.rb
 spec/jetty_rails/runner_spec.rb
+spec/jetty_rails_sample_1.yml
+spec/jetty_rails_sample_2.yml
 spec/jetty_rails_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
 tasks/deployment.rake
 tasks/environment.rake
 tasks/rspec.rake
-tasks/website.rake
+tasks/website.rake

data/README.txt

@@ -1,6 +1,6 @@
 = jetty-rails
 
-jetty-rails.rubyforge.net
+http://jetty-rails.rubyforge.net
 
 == DESCRIPTION:
 
@@ -14,6 +14,7 @@ The project has born from my own needs. I needed to run JForum (http://jforum.ne
 
 * Uses {JRuby Rack}[http://wiki.jruby.org/wiki/JRuby_Rack].
 * Loads all jars inside your application lib/ dir, by default.
+* Loads all classes inside your application classes/ dir, by default.
 * Supports rails and merb applications out of the box.
 
 == KNOWN ISSUES
@@ -30,7 +31,7 @@ jruby -S rake rcov
   cd myrailsapp
   jruby -S jetty_rails
   
---help option shows usage details:
+help option shows usage details:
   
   jruby -S jetty_rails --help
   
@@ -39,9 +40,19 @@ jruby -S rake rcov
   cd mymerbapp
   jruby -S jetty_merb
 
---help option shows usage details:
+help option shows usage details:
+
+  jruby -S jetty_merb --help
+
+=== Merb:
+
+  cd mymerbapp
+  jruby -S jetty_merb
+
+help option shows usage details:
+
+  jruby -S jetty_merb --help
 
-  jruby -S jetty_rails --help
 
 == REQUIREMENTS:
 
@@ -53,6 +64,67 @@ it properly installed and inserted in your PATH environment variable.
 == INSTALL:
 
   jruby -S gem install jetty-rails
+  
+== BUGS AND NEW FEATURES
+
+Using Lighthouse: http://fabiokung.lighthouseapp.com/projects/12666-jetty-rails
+
+
+== MULTIPLE SERVERS:
+
+You can specify a configuration yaml file rather than command line switches. 
+The file also allows specifying multiple servers and / or application contexts for single jetty container.
+
+For example, you could set a context_path of /testA on port 8888 which is rails, /testB also that port which is merb.
+Or, you could have /testA on port 8888 and /testB on port 9999.
+
+ jruby -S jetty_rails -c path/to/config.yml
+
+The configuration options are inherited, so if you specify the environment to be "production" at the top level, 
+then any servers and application context will be "production" unless the choose to override the value.
+
+- server settings:
+  <tt>:port</tt>, <tt>:jruby_min_runtimes</tt>, <tt>:jruby_max_runtimes</tt>, <tt>:thread_pool_max</tt>, <tt>:thread_pool_min</tt>, <tt>:acceptor_size</tt>
+
+- application context settings:
+  <tt>:context_path</tt>, <tt>:base</tt>, <tt>:adapter</tt>, <tt>:environment</tt>, <tt>:lib_dir</tt>, <tt>:gem_path</tt>
+
+As part of the configuration you have some control over jruby & jetty.
+
+See spec/config.yml, spec/jetty_rails_sample_1.yml, and spec/jetty_rails_sample_2.yml for more examples.
+
+=== Rails:
+
+If -c is not specified, by default jetty_rails will look for a config/jetty_rails.yml relative to where it is started.
+
+Don't forget to add this into your config/environment.rb
+ActionController::AbstractRequest.relative_url_root = "/testA"
+
+
+=== JRuby Configuration
+
+You can tweak the JRuby runtimes per application context:
+
+  jruby_min_runtimes: 1
+  jruby_max_runtimes: 2
+
+
+=== Jetty Configuration
+
+You can also modify the jetty per server configurations:
+
+Thread pool will define the thread pool available to the jetty server using a QueuedThreadPool.
+
+  thread_pool_max: 40
+  thread_pool_min: 1
+
+
+The acceptor size is the number of acceptor threads available for that server's channel connector.
+
+  acceptor_size: 20
+
+See the jetty documentation for more information.
+
 
 == LICENSE:
 

data/TODO.txt

@@ -0,0 +1,13 @@
+== TODO never ends...
+
+* Improve RDocs
+* configuration defaults (web.xml, classes dir, lib dir, ...)
+* integration test for lib_dir jars loading
+* read configuration from warble.rb
+* install custom resources from warbler configuration
+* more command line options: --daemon, --num-instances
+* add custom classes from warble.rb to the context classpath
+* add custom jars from warble.rb to the context classpath
+* load web.xml (or web.erb.xml) from config/web.xml
+* read any custom jetty.xml
+* support jetty-plus features (i.e.: jndi)

data/bin/jetty_merb

@@ -20,67 +20,21 @@
 # --environment ENV, -e ENV::
 #    change rails environment (default: development)
 #
+# --classes CLASSES_DIR::
+#    directory containing java classes used by the application (default: 'classes/')
+#
+# --lib LIB_DIR, --jars LIB_DIR::
+#    directory containing jars used by the application (default: 'lib/')
+#
+# --config FILE, -c FILE:: (optional)
+#	config file to use instead of command line switches (allows for multiple servers)
+#
 # BASEDIR (optional): directory to be run (default: current).
 
 require "java"
+$LOAD_PATH << "#{File.dirname(__FILE__)}/../lib"
 require "jetty_rails"
-require 'getoptlong'
-require 'rdoc/usage'
-
-# fix to work with rubygems (use current file instead of main)
-def RDoc.usage_no_exit(*args)
-  comment = File.open(__FILE__) do |file|
-    find_comment(file)
-  end
-
-  comment = comment.gsub(/^\s*#/, '')
-
-  markup = SM::SimpleMarkup.new
-  flow_convertor = SM::ToFlow.new
-
-  flow = markup.convert(comment, flow_convertor)
-
-  format = "plain"
-
-  unless args.empty?
-    flow = extract_sections(flow, args)
-  end
-
-  options = RI::Options.instance
-  if args = ENV["RI"]
-    options.parse(args.split)
-  end
-  formatter = options.formatter.new(options, "")
-  formatter.display_flow(flow)
-end
-
-opts = GetoptLong.new(
-    [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
-    [ '--context-path', '-u', GetoptLong::REQUIRED_ARGUMENT ],
-    [ '--port', '-p', GetoptLong::REQUIRED_ARGUMENT ],
-    [ '--environment', '-e', GetoptLong::REQUIRED_ARGUMENT ]
-  )
-
-config = {
-  :base => Dir.pwd,
-  :port => 4000,
-  :adapter => :merb
-}
-
-opts.each do |opt, arg|
-  case opt
-    when '--help'
-      RDoc::usage
-    when '--context-path'
-      config[:context_path] = arg
-    when '--port'
-      config[:port] = arg.to_i
-    when '--environment'
-      config[:environment] = arg
-  end
-end
-
-config[:base] = ARGV.shift unless ARGV.empty?
 
-runner = JettyRails::Runner.new(config)
+options = CommandLineReader.new.read(:merb)
+runner = JettyRails::Runner.new(options)
 runner.start

data/bin/jetty_rails

@@ -20,67 +20,21 @@
 # --environment ENV, -e ENV::
 #    change rails environment (default: development)
 #
+# --classes CLASSES_DIR::
+#    directory containing java classes used by the application (default: 'classes/')
+#
+# --lib LIB_DIR, --jars LIB_DIR::
+#    directory containing jars used by the application (default: 'lib/')
+#
+# --config FILE, -c FILE:: (optional)
+#	config file to use instead of command line switches (allows for multiple servers)
+#
 # BASEDIR (optional): directory to be run (default: current).
 
 require "java"
+$LOAD_PATH << "#{File.dirname(__FILE__)}/../lib"
 require "jetty_rails"
-require 'getoptlong'
-require 'rdoc/usage'
-
-# fix to work with rubygems (use current file instead of main)
-def RDoc.usage_no_exit(*args)
-  comment = File.open(__FILE__) do |file|
-    find_comment(file)
-  end
-
-  comment = comment.gsub(/^\s*#/, '')
-
-  markup = SM::SimpleMarkup.new
-  flow_convertor = SM::ToFlow.new
-
-  flow = markup.convert(comment, flow_convertor)
-
-  format = "plain"
-
-  unless args.empty?
-    flow = extract_sections(flow, args)
-  end
-
-  options = RI::Options.instance
-  if args = ENV["RI"]
-    options.parse(args.split)
-  end
-  formatter = options.formatter.new(options, "")
-  formatter.display_flow(flow)
-end
-
-opts = GetoptLong.new(
-    [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
-    [ '--context-path', '-u', GetoptLong::REQUIRED_ARGUMENT ],
-    [ '--port', '-p', GetoptLong::REQUIRED_ARGUMENT ],
-    [ '--environment', '-e', GetoptLong::REQUIRED_ARGUMENT ]
-  )
-
-config = {
-  :base => Dir.pwd,
-  :port => 3000,
-  :adapter => :rails
-}
-
-opts.each do |opt, arg|
-  case opt
-    when '--help'
-      RDoc::usage
-    when '--context-path'
-      config[:context_path] = arg
-    when '--port'
-      config[:port] = arg.to_i
-    when '--environment'
-      config[:environment] = arg
-  end
-end
-
-config[:base] = ARGV.shift unless ARGV.empty?
 
-runner = JettyRails::Runner.new(config)
+options = CommandLineReader.new.read(:rails)
+runner = JettyRails::Runner.new(options)
 runner.start

data/config/requirements.rb

@@ -2,7 +2,7 @@ require 'fileutils'
 include FileUtils
 
 require 'rubygems'
-%w[rake hoe newgem rubigen].each do |req_gem|
+%w[rake hoe rubigen].each do |req_gem|
   begin
     require req_gem
   rescue LoadError

data/lib/jetty_rails.rb

@@ -5,10 +5,15 @@ require "java"
 require "rubygems"
 require "activesupport"
 require "jetty_rails/jars"
+require "jetty_rails/adapters/abstract_adapter"
 require "jetty_rails/adapters/rails_adapter"
 require "jetty_rails/adapters/merb_adapter"
 require "jetty_rails/runner"
+require "jetty_rails/server"
 require "jetty_rails/handler/delegate_on_errors_handler"
+require "jetty_rails/handler/public_directory_handler"
+require "jetty_rails/handler/web_app_handler"
+require "jetty_rails/config/command_line_reader"
 
 module JettyRails
   JETTY_RAILS_HOME = File.dirname(__FILE__) + "/.." unless defined?(JETTY_RAILS_HOME)

data/lib/jetty_rails/adapters/abstract_adapter.rb

@@ -0,0 +1,25 @@
+module JettyRails
+  module Adapters
+    class AbstractAdapter
+      attr_reader :config
+      
+      def initialize(config)
+        @config = config
+      end
+      
+      def base_init_params()
+        @base_init_params ||= { 
+          'public.root' => '/public',
+          'gem.path' => config[:gem_path] || ENV['GEM_PATH'] || 'tmp/war/WEB-INF/gems',
+          'jruby.initial.runtimes' => "#{config[:jruby_min_runtimes]}",
+          'jruby.min.runtimes' => "#{config[:jruby_min_runtimes]}",
+          'jruby.max.runtimes' => "#{config[:jruby_max_runtimes]}"
+        }
+      end
+      
+      def event_listeners
+        []
+      end
+    end
+  end
+end

data/lib/jetty_rails/adapters/merb_adapter.rb

@@ -1,21 +1,14 @@
 module JettyRails
   module Adapters
     
-    class MerbAdapter
-      attr_reader :config
-      
-      def initialize(config)
-        @config = config
-      end
+    class MerbAdapter < AbstractAdapter
       
       def init_params
         # please refer to goldspike and jruby-rack documentation
         @merb_params ||= {
           'merb.root' => '/',
-          'public.root' => '/public',
-          'merb.environment' => config[:environment],
-          'gem.path' => ENV['GEM_PATH'] || 'tmp/war/WEB-INF/gems'
-        }
+          'merb.environment' => config[:environment]
+        }.merge(base_init_params)
       end
       
       def event_listeners

data/lib/jetty_rails/adapters/rails_adapter.rb

@@ -1,21 +1,15 @@
 module JettyRails
   module Adapters
     
-    class RailsAdapter
-      attr_reader :config
-      
-      def initialize(config)
-        @config = config
-      end
-      
+    class RailsAdapter < AbstractAdapter
+            
       def init_params
         # please refer to goldspike and jruby-rack documentation
+        # in: PoolingRackApplicationFactory 
         @rails_params ||= {
           'rails.root' => '/',
-          'public.root' => '/public',
-          'rails.env' => config[:environment],
-          'gem.path' => ENV['GEM_PATH'] || 'tmp/war/WEB-INF/gems'
-        }
+          'rails.env' => config[:environment]
+        }.merge(base_init_params)
       end
       
       def event_listeners