trinidad 1.3.5 → 1.4.0.RC

data/lib/trinidad/core_ext.rb

@@ -1,42 +0,0 @@
-Hash.class_eval do
-  # Merges self with another hash, recursively.
-  #
-  # This code was lovingly stolen from some random gem:
-  # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
-  #
-  # Thanks to whoever made it.
-  def deep_merge(hash)
-    target = dup
-
-    hash.keys.each do |key|
-      if hash[key].is_a? Hash and self[key].is_a? Hash
-        target[key] = target[key].deep_merge(hash[key])
-        next
-      end
-
-      value = hash[key]
-      value.strip! if value.respond_to?(:strip!)
-      target[key] = value
-    end
-
-    target
-  end
-
-  def deep_merge!(second)
-    second.each_pair do |k,v|
-      if self[k].is_a?(Hash) and second[k].is_a?(Hash)
-        self[k].deep_merge!(second[k])
-      else
-        self[k] = second[k]
-      end
-    end
-  end
-
-  def symbolize!
-    keys.each do |key|
-      self[key].symbolize! if self[key].is_a?(Hash)
-      self[key.to_sym] = self.delete(key)
-    end
-    self
-  end
-end

data/lib/trinidad/lifecycle/lifecycle_listener_base.rb

@@ -1,88 +0,0 @@
-module Trinidad
-  module Lifecycle
-    class Base
-      include Trinidad::Tomcat::LifecycleListener
-      attr_reader :webapp
-
-      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
-
-        file_handler = jlogging.FileHandler.new(log_path, true)
-
-        out_handler  = jlogging.ConsoleHandler.new
-        out_handler.set_output_stream JRuby.runtime.out
-
-        err_handler  = jlogging.ConsoleHandler.new
-        err_handler.set_output_stream JRuby.runtime.err
-
-        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)
-
-        console_handler = logger.handlers.first
-        logger.remove_handler(console_handler)
-
-        logger.add_handler(file_handler)
-        logger.add_handler(out_handler)
-        logger.add_handler(err_handler)
-
-        logger.handlers.each do |handler|
-          handler.level = level
-          handler.formatter = Trinidad::LogFormatter.new
-        end
-
-        logger.level = level
-
-        @configured_logger = true
-      end
-    end
-  end
-end

data/lib/trinidad/lifecycle/lifecycle_listener_default.rb

@@ -1,84 +0,0 @@
-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
-          listeners = context.findLifecycleListeners
-          context_config = listeners && listeners.find do |listener|
-            listener.is_a?(Trinidad::Tomcat::ContextConfig)
-          end
-
-          unless context_config
-            context_config = Trinidad::Tomcat::ContextConfig.new
-            context.addLifecycleListener(context_config)
-          end
-
-          context_config.setDefaultWebXml(descriptor)
-        end
-        descriptor
-      end
-
-      def configure_rack_servlet(context)
-        wrapper = context.create_wrapper
-        if @webapp.servlet[:instance]
-          wrapper.servlet = @webapp.servlet[:instance]
-        else
-          wrapper.servlet_class = @webapp.servlet[:class]
-        end
-        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) unless @webapp.servlet[:instance]
-      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_host.rb

@@ -1,81 +0,0 @@
-module Trinidad
-  module Lifecycle
-
-    class Host
-      include Trinidad::Tomcat::LifecycleListener
-
-      attr_reader :contexts
-
-      def initialize(tomcat, *contexts)
-        @tomcat = tomcat
-        @contexts = contexts
-      end
-
-      def lifecycleEvent(event)
-        host = event.lifecycle
-
-        case event.type
-        when Trinidad::Tomcat::Lifecycle::BEFORE_START_EVENT
-          init_monitors
-        when Trinidad::Tomcat::Lifecycle::PERIODIC_EVENT
-          check_monitors
-        end
-      end
-
-      def init_monitors
-        @contexts.each do |c|
-          monitor = c[:monitor]
-          opts = File.exist?(monitor) ? 'r' : 'w+'
-
-          unless File.exist?(dir = File.dirname(monitor))
-            Dir.mkdir dir
-          end
-
-          file = File.new(monitor, opts)
-          c[:mtime] = file.mtime
-        end
-      end
-
-      def check_monitors
-        @contexts.each do |c|
-          # double check monitor, capistrano removes it temporarily
-          sleep(0.5) unless File.exist?(c[:monitor])
-          next unless File.exist?(c[:monitor])
-
-          if (mtime = File.mtime(c[:monitor])) > c[:mtime] && !c[:lock]
-            c[:lock] = true
-            c[:mtime] = mtime
-            c[:context] = create_takeover(c)
-            Thread.new { c[:context].start }
-          end
-        end
-      end
-
-      def create_takeover(c)
-        web_app = c[:app]
-        old_context = c[:context]
-
-        context = Trinidad::Tomcat::StandardContext.new
-        context.name = rand.to_s
-        context.path = old_context.path
-        context.doc_base = web_app.web_app_dir
-
-        context.add_lifecycle_listener Trinidad::Tomcat::Tomcat::DefaultWebXmlListener.new
-
-        config = Trinidad::Tomcat::ContextConfig.new
-        config.default_web_xml = 'org/apache/catalina/startup/NO_DEFAULT_XML'
-        context.add_lifecycle_listener config
-
-        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))
-
-        old_context.parent.add_child context
-
-        context
-      end
-    end
-  end
-end

data/lib/trinidad/lifecycle/lifecycle_listener_war.rb

@@ -1,43 +0,0 @@
-module Trinidad
-  module Lifecycle
-    class War < Base
-      def lifecycleEvent(event)
-        case event.type
-        when Trinidad::Tomcat::Lifecycle::AFTER_STOP_EVENT
-          destroy_expanded_app
-        when Trinidad::Tomcat::Lifecycle::BEFORE_START_EVENT
-          expand_app(event.lifecycle)
-        end
-
-        super
-      end
-
-      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
-
-      def destroy_expanded_app
-        require 'fileutils'
-        FileUtils.rm_rf @webapp.web_app_dir.gsub(/\.war$/, '')
-      end
-
-      def expand_app(context)
-        if !File.exist?(context.doc_base)
-          host = context.parent
-          war_file = java.io.File.new(@webapp.web_app_dir)
-          war = java.net.URL.new("jar:" + war_file.toURI.toURL.to_s + "!/")
-          path_name = File.basename(context.doc_base)
-
-          Trinidad::Tomcat::ExpandWar.expand(host, war, path_name)
-        end
-      end
-    end
-  end
-end

data/lib/trinidad/lifecycle/takeover.rb

@@ -1,25 +0,0 @@
-module Trinidad
-  module Lifecycle
-    class Takeover
-      include Trinidad::Tomcat::LifecycleListener
-      def initialize(old)
-        @old = old
-      end
-
-      def lifecycleEvent(event)
-        if event.type == Trinidad::Tomcat::Lifecycle::AFTER_START_EVENT
-          begin
-            name = @old[:context].name
-
-            @old[:context].stop
-            @old[:context].destroy
-
-            event.lifecycle.name = name
-          ensure
-            @old.delete(:lock)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/trinidad/log_formatter.rb

@@ -1,18 +0,0 @@
-module Trinidad
-  class LogFormatter < Java::JavaUtilLogging::Formatter
-    def initialize(format = "yyyy-MM-dd HH:mm:ss")
-      @format = Java::JavaText::SimpleDateFormat.new format
-      calendar = Java::JavaUtil::GregorianCalendar.new
-      calendar.time_zone = Java::JavaUtil::SimpleTimeZone.new(0, 'UTC')
-      @format.calendar = calendar
-    end
-
-    def format(record)
-      timestamp = @format.format(Java::JavaUtil::Date.new record.millis)
-      level = record.level.name
-      message = record.message.chomp
-
-      "#{timestamp} #{level}: #{message}\n"
-    end
-  end
-end

data/lib/trinidad/rackup_web_app.rb

@@ -1,16 +0,0 @@
-module Trinidad
-  class RackupWebApp < WebApp
-
-    def init_params
-      super
-      if rackup_path = rackup
-        rackup_path = File.join(rackup_path, 'config.ru') if File.directory?(rackup_path)
-        add_parameter_unless_exist('rackup.path', rackup_path)
-        add_parameter_unless_exist('rack.env', environment.to_s)
-      end
-      @params
-    end
-
-    def context_listener; 'org.jruby.rack.RackServletContextListener'; end
-  end
-end

data/lib/trinidad/rails_web_app.rb

@@ -1,13 +0,0 @@
-module Trinidad
-  class RailsWebApp < WebApp
-
-    def init_params
-      super
-      add_parameter_unless_exist 'rails.env', environment.to_s
-      add_parameter_unless_exist 'rails.root', '/'
-      @params
-    end
-
-    def context_listener; 'org.jruby.rack.rails.RailsServletContextListener'; end
-  end
-end

data/lib/trinidad/war_web_app.rb

@@ -1,19 +0,0 @@
-module Trinidad
-  class WarWebApp < WebApp
-    def context_path
-      super.gsub(/\.war$/, '')
-    end
-
-    def work_dir
-      File.join(web_app_dir.gsub(/\.war$/, ''), 'WEB-INF')
-    end
-
-    def monitor
-      File.expand_path(web_app_dir)
-    end
-
-    def define_lifecycle
-      Trinidad::Lifecycle::War.new(self)
-    end
-  end
-end