trinidad 1.2.2 → 1.2.3

data/History.txt

@@ -1,3 +1,7 @@
+== Trinidad 1.2.3 (2011-07-13)
+
+* fix JRuby class loader generation with hot deploy
+
 == Trinidad 1.2.2 (2011-07-12)
 
 * Better log formatter

data/lib/trinidad.rb

@@ -23,5 +23,5 @@ require 'trinidad/rackup_web_app'
 require 'trinidad/war_web_app'
 
 module Trinidad
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

data/lib/trinidad/lifecycle/lifecycle_listener_host.rb

@@ -68,6 +68,7 @@ module Trinidad
 
         Trinidad::Extensions.configure_webapp_extensions(web_app.extensions, @tomcat, context)
 
+        web_app.generate_class_loader
         context.add_lifecycle_listener(web_app.define_lifecycle)
         context.add_lifecycle_listener(Trinidad::Lifecycle::Takeover.new(c))
 

data/lib/trinidad/web_app.rb

@@ -21,7 +21,7 @@ module Trinidad
       @config = config
       @app_config = app_config
 
-      @class_loader = org.jruby.util.JRubyClassLoader.new(JRuby.runtime.jruby_class_loader)
+      generate_class_loader
 
       configure_rack_servlet(servlet_class, servlet_name) unless rack_servlet_configured?
     end
@@ -102,6 +102,10 @@ module Trinidad
       Trinidad::Lifecycle::Default.new(self)
     end
 
+    def generate_class_loader
+      @class_loader = org.jruby.util.JRubyClassLoader.new(JRuby.runtime.jruby_class_loader)
+    end
+
     protected
     def add_parameter_unless_exist(param_name, param_value)
       @params[param_name] = param_value unless web_context_param(param_name)

metadata

@@ -2,7 +2,7 @@
 name: trinidad
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors: 
   - David Calavera
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-12 00:00:00 +02:00
+date: 2011-07-13 00:00:00 +02:00
 default_executable: trinidad
 dependencies: 
   - !ruby/object:Gem::Dependency