jetty-rails 0.7 → 0.8

data/History.txt

@@ -1,3 +1,7 @@
+== 0.8
+* reading config/web.xml file (not yet supporting config/web.xml.erb)
+* supporting /public/WEB-INF dir for custom web resources (config files and taglibs)
+
 == 0.7
 * Merb 1.0 support!
 * jruby-rack updated to the latest release (0.9.3)

data/TODO.txt

@@ -1,13 +1,11 @@
 == 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
+* support config/web.xml.erb
 * read any custom jetty.xml
 * support jetty-plus features (i.e.: jndi)

data/lib/jetty_rails/handler/web_app_handler.rb

@@ -7,23 +7,23 @@ module JettyRails
         super("/", config[:context_path])
         @config = config
 
-        # create an isolated classloader per application context
-        self.class_loader = org.jruby.util.JRubyClassLoader.new(JRuby.runtime.jruby_class_loader)
-        
-        self.resource_base = config[:base]
+        self.class_loader = each_context_has_its_own_classloader
+        self.resource_base = "#{config[:base]}/public"
         self.descriptor = config[:web_xml]
         
         add_classes_dir_to_classpath(config)
         add_lib_dir_jars_to_classpath(config)
-    
+        
         @adapter = adapter_for(config[:adapter])
         self.init_params = @adapter.init_params
         
-        @adapter.event_listeners.each do |listener|
-          add_event_listener(listener)
-        end
+        unless File.exist?(self.descriptor)
+          @adapter.event_listeners.each do |listener|
+            add_event_listener(listener)
+          end
 
-        add_filter(rack_filter, "/*", Jetty::Context::DEFAULT)
+          add_filter(rack_filter, "/*", Jetty::Context::DEFAULT)
+        end
       end
   
       def self.add_adapter(adapter_key, adapter)
@@ -40,6 +40,13 @@ module JettyRails
       def adapters
         self.class.adapters
       end
+      
+      alias :get_from_public_otherwise :getResource 
+      
+      def getResource(resource)
+        return fix_for_base_url if resource == '/'
+        get_from_public_otherwise resource
+      end
   
       protected
       def rack_filter
@@ -51,6 +58,10 @@ module JettyRails
       end
       
       private
+      def fix_for_base_url
+        Jetty::FileResource.new(java.io.File.new(config[:base]).to_url)
+      end
+      
       def add_lib_dir_jars_to_classpath(config)
         lib_dir = "#{config[:base]}/#{config[:lib_dir]}/**/*.jar"
         Dir[lib_dir].each do |jar|
@@ -58,11 +69,16 @@ module JettyRails
           self.class_loader.add_url(url)
         end
       end
+      
       def add_classes_dir_to_classpath(config)
         classes_dir = "#{config[:base]}/#{config[:classes_dir]}"
         url = java.io.File.new(classes_dir).to_url
         self.class_loader.add_url(url)
       end
+      
+      def each_context_has_its_own_classloader()
+        org.jruby.util.JRubyClassLoader.new(JRuby.runtime.jruby_class_loader)
+      end
     end
   end
 end

data/lib/jetty_rails/jars.rb

@@ -11,6 +11,7 @@ module JettyRails
     include_package "org.mortbay.jetty"
     include_package "org.mortbay.jetty.servlet"
     include_package "org.mortbay.jetty.nio"
+    include_package "org.mortbay.resource"
     module Handler
       include_package "org.mortbay.jetty.handler"
       include_package "org.mortbay.jetty.webapp"

data/lib/jetty_rails/runner.rb

@@ -28,7 +28,7 @@ module JettyRails
     def start
       server_threads = ThreadGroup.new
       @servers.each do |base, server|
-        log("starting #{base}")
+        log("Starting server #{base}")
         server_threads.add(Thread.new do
           server.start
         end)

data/lib/jetty_rails/version.rb

@@ -1,7 +1,7 @@
 module JettyRails #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 7
+    MINOR = 8
 
     STRING = [MAJOR, MINOR].join('.')
   end

metadata

@@ -6,11 +6,11 @@ executables:
 - jetty_merb
 - jetty_rails
 version: !ruby/object:Gem::Version 
-  version: "0.7"
+  version: "0.8"
 post_install_message: |
   
   For more information on jetty-rails, see http://jetty-rails.rubyforge.org
-date: 2008-11-28 02:00:00 +00:00
+date: 2008-12-02 02:00:00 +00:00
 files: 
 - History.txt
 - Licenses.txt