trinidad 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.1 (2010-11-04)
+
+* fix problem loading lifecycle
+
 == 1.0.0 (2010-11-04)
 
 * Warbler support

data/lib/trinidad.rb

@@ -24,5 +24,5 @@ require 'trinidad/rackup_web_app'
 require 'trinidad/war_web_app'
 
 module Trinidad
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/trinidad/lifecycle/lifecycle_listener_base.rb

@@ -0,0 +1,75 @@
+module Trinidad
+  module Lifecycle
+    class Base
+      include Trinidad::Tomcat::LifecycleListener
+
+      def initialize(webapp)
+        @webapp = webapp
+        @configured_logger = false
+      end
+
+      def lifecycleEvent(event)
+        if Trinidad::Tomcat::Lifecycle::BEFORE_START_EVENT == event.type
+          context = event.lifecycle
+          configure_defaults(context)
+        end
+      end
+
+      def configure_defaults(context)
+        remove_defaults(context)
+        configure_logging
+      end
+
+      def remove_defaults(context)
+        context.remove_welcome_file('index.jsp')
+        context.remove_welcome_file('index.htm')
+        context.remove_welcome_file('index.html')
+
+        jsp_servlet = context.find_child('jsp')
+        context.remove_child(jsp_servlet) if jsp_servlet
+
+        context.remove_servlet_mapping('*.jspx')
+        context.remove_servlet_mapping('*.jsp')
+
+        context.process_tlds = false
+        context.xml_validation = false
+      end
+
+      def configure_logging
+        return if @configured_logger
+
+        log_path = File.join(@webapp.work_dir, 'log', "#{@webapp.environment}.log")
+        log_file = java.io.File.new(log_path)
+
+        unless log_file.exists
+          log_file.parent_file.mkdirs
+          log_file.create_new_file
+        end
+
+        jlogging = java.util.logging
+
+        log_handler = jlogging.FileHandler.new(log_path, true)
+        logger = jlogging.Logger.get_logger("")
+
+        log_level = @webapp.log
+        unless %w{ALL CONFIG FINE FINER FINEST INFO OFF SEVERE WARNING}.include?(log_level)
+          puts "Invalid log level #{log_level}, using default: INFO"
+          log_level = 'INFO'
+        end
+
+        level = jlogging.Level.parse(log_level)
+
+        logger.handlers.each do |handler|
+          handler.level = level
+        end
+
+        logger.level = level
+
+        log_handler.formatter = jlogging.SimpleFormatter.new
+        logger.add_handler(log_handler)
+
+        @configured_logger = true
+      end
+    end
+  end
+end

data/lib/trinidad/lifecycle/lifecycle_listener_default.rb

@@ -0,0 +1,75 @@
+module Trinidad
+  module Lifecycle
+    class Default < Base
+      def configure_defaults(context)
+        super
+        deployment_descriptor = configure_deployment_descriptor(context)
+        unless deployment_descriptor
+          configure_rack_servlet(context)
+          configure_rack_listener(context)
+        end
+        configure_init_params(context)
+        configure_context_loader(context)
+      end
+
+      def configure_deployment_descriptor(context)
+        if descriptor = @webapp.default_deployment_descriptor
+          context.setDefaultWebXml(descriptor)
+
+          context_config = Trinidad::Tomcat::ContextConfig.new
+          context_config.setDefaultWebXml(descriptor)
+
+          context.addLifecycleListener(context_config)
+        end
+        descriptor
+      end
+
+      def configure_rack_servlet(context)
+        wrapper = context.create_wrapper
+        wrapper.servlet_class = @webapp.servlet[:class]
+        wrapper.name = @webapp.servlet[:name]
+
+        context.add_child(wrapper)
+        context.add_servlet_mapping('/*', wrapper.name)
+      end
+
+      def configure_rack_listener(context)
+        context.addApplicationListener(@webapp.rack_listener)
+      end
+
+      def configure_init_params(context)
+        @webapp.init_params.each do |name, value|
+          context.addParameter(name, value)
+        end
+      end
+
+      def configure_context_loader(context)
+        class_loader = @webapp.class_loader
+
+        add_application_jars(class_loader)
+        add_application_java_classes(class_loader)
+
+        loader = Trinidad::Tomcat::WebappLoader.new(class_loader)
+        loader.container = context
+        context.loader = loader
+      end
+
+      def add_application_jars(class_loader)
+        return unless @webapp.libs_dir
+
+        resources_dir = File.join(@webapp.web_app_dir, @webapp.libs_dir, '**', '*.jar')
+
+        Dir[resources_dir].each do |resource|
+          class_loader.addURL(java.io.File.new(resource).to_url)
+        end
+      end
+
+      def add_application_java_classes(class_loader)
+        return unless @webapp.classes_dir
+
+        resources_dir = File.join(@webapp.web_app_dir, @webapp.classes_dir)
+        class_loader.addURL(java.io.File.new(resources_dir).to_url)
+      end
+    end
+  end
+end

data/lib/trinidad/lifecycle/lifecycle_listener_war.rb

@@ -0,0 +1,16 @@
+module Trinidad
+  module Lifecycle
+    class War < Base
+      def configure_defaults(context)
+        super
+        configure_class_loader(context)
+      end
+
+      def configure_class_loader(context)
+        loader = Trinidad::Tomcat::WebappLoader.new(@webapp.class_loader)
+        loader.container = context
+        context.loader = loader
+      end
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 1
     - 0
-    - 0
-  version: 1.0.0
+    - 1
+  version: 1.0.1
 platform: ruby
 authors: 
   - David Calavera
@@ -104,6 +104,9 @@ files:
   - lib/trinidad/server.rb
   - lib/trinidad/war_web_app.rb
   - lib/trinidad/web_app.rb
+  - lib/trinidad/lifecycle/lifecycle_listener_base.rb
+  - lib/trinidad/lifecycle/lifecycle_listener_default.rb
+  - lib/trinidad/lifecycle/lifecycle_listener_war.rb
 has_rdoc: true
 homepage: http://github.com/calavera/trinidad
 licenses: []