trinidad_lifecycle_extension 0.2.0 → 0.2.1

data/History.txt

@@ -0,0 +1,5 @@
+== 0.2.1 (2011-01-17)
+
+* Remote jmx configuration that doesn't work, just export JVM properties instead.
+* Use lib/lifecycle as default path.
+* Fix error when there arent listeners to load.

data/README

@@ -5,6 +5,10 @@ This extension allows you to add lifecycle listeners written in ruby to the
 Trinidad's server context as well as each application context that runs on top
 of Trinidad.
 
+This extension also allows to enable the jmx monitoring capabilities of Tomcat.
+The configuration that Tomcat needs can be set as JAVA_OPTS properties or
+through the Trinidad's configuration file.
+
 
 Configuration
 =============
@@ -14,31 +18,12 @@ to the directory where the listeners are. For instance:
 
 extensions:
   lifecycle:
-    path: 'lib/lifecycle'
+    path: 'lib/lifecycle' # Path by default, not required
 
 Trinidad will try to load each class into that directory and add it to the
 approrpiated context regarding where the extension will be configured, into the
 server section or into the web_app section.
 
-This extension also allows to enable the jmx monitoring capabilities of Tomcat.
-The configuration that Tomcat needs can be set as JAVA_OPTS properties or
-through the Trinidad's configuration file:
-
-extensions:
-  lifecycle:
-    jmx:
-      port: 9000 # not required, 8181 by default
-      authenticate: true # not required, false by default
-      ssl_enabled: #not required
-      ssl_cypher_suites: #not required
-      ssl_auth: # not required
-      password_file: # not required
-      access_file: #not required
-
-See the Tomcat's documention for a complete references of the options:
-
-  http://tomcat.apache.org/tomcat-6.0-doc/monitoring.html
-
 How to write a lifecycle listener
 =================================
 
@@ -51,14 +36,11 @@ example:
 module Trinidad
   module Lifecycle
     module WebApp
-      import org.apache.catalina.LifecycleListener
-      import org.apache.catalina.Lifecycle
-
       class WebAppListener
-        include LifecycleListener
+        include Trinidad::Tomcat::LifecycleListener
 
         def lifecycleEvent(event)
-          if Lifecycle::BEFORE_START_EVENT == event.type
+          if Trinidad::Tomcat::Lifecycle::BEFORE_START_EVENT == event.type
             # do something before start the web application context
           end
         end
@@ -78,4 +60,4 @@ http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Lifecycle.jav
 
 == Copyright
 
-Copyright (c) 2010 David Calavera<calavera@apache.org>. See LICENSE for details.
+Copyright (c) 2011 David Calavera<calavera@apache.org>. See LICENSE for details.

data/lib/trinidad_lifecycle_extension.rb

@@ -1,23 +1,22 @@
 require 'rubygems'
 gem 'trinidad_jars'
 require 'trinidad/extensions'
+require 'java'
 
 module Trinidad
   module Extensions
     module Lifecycle
-      VERSION = '0.2.0'
-
-      DEFAULT_JMX_OPTIONS = {
-        :port => '8181',
-        :authenticate => false
-      }
+      VERSION = '0.2.1'
 
       def init_listeners(context, path, mod_name)
+        path ||= File.join('lib', 'lifecycle')
+
         Dir.glob("#{path}/*.rb").each do |listener|
           load listener
         end
 
         mod = constantize(mod_name)
+        return unless mod
 
         mod.constants.each do |listener|
           const_listener = mod.const_get(listener)
@@ -27,7 +26,7 @@ module Trinidad
 
       def constantize(mod)
         names = mod.split('::')
-        names.inject(Object) {|constant, obj| constant.const_get(obj) }
+        names.inject(Object) {|constant, obj| constant.const_get(obj) } rescue nil
       end
     end
 
@@ -36,35 +35,7 @@ module Trinidad
       include Lifecycle
 
       def configure(tomcat)
-        if @options.has_key?(:path)
-          init_listeners(tomcat.server, @options[:path], 'Trinidad::Lifecycle::Server')
-        end
-        if @options.has_key?(:jmx)
-          export_jmx_settings
-
-          require File.expand_path('../../trinidad-libs/tomcat-catalina-jmx-remote', __FILE__)
-          tomcat.server.add_lifecycle_listener(org.apache.catalina.mbeans.JmxRemoteLifecycleListener.new)
-        end
-      end
-
-      def export_jmx_settings
-        options = DEFAULT_JMX_OPTIONS.merge(@options[:jmx] || {})
-
-        set_property("com.sun.management.jmxremote", "true")
-        set_property("com.sun.management.jmxremote.port", options[:port])
-
-        set_property("com.sun.management.jmxremote.ssl", options[:ssl_enabled])
-        set_property("com.sun.management.jmxremote.ssl.enabled.protocols", options[:ssl_protocols])
-        set_property("com.sun.management.jmxremote.ssl.enabled.cipher.suites", options[:ssl_cypher_suites])
-        set_property("com.sun.management.jmxremote.ssl.need.client.auth", options[:ssl_auth])
-        set_property("com.sun.management.jmxremote.authenticate", options[:authenticate])
-        set_property("com.sun.management.jmxremote.password.file", options[:password_file])
-        set_property("com.sun.management.jmxremote.access.file", options[:access_file])
-      end
-
-      private
-      def set_property(name, option)
-        java.lang.System.set_property(name, option) if option
+        init_listeners(tomcat.server, @options[:path], 'Trinidad::Lifecycle::Server')
       end
     end
 

data/spec/fixtures/fake_lifecycle_listener.rb

@@ -1,11 +1,9 @@
 module Trinidad
   module Lifecycle
-    import org.apache.catalina.LifecycleListener
-    import org.apache.catalina.Lifecycle
 
     module Server
       class FakeServerListener
-        include LifecycleListener
+        include Trinidad::Tomcat::LifecycleListener
 
         def lifecycleEvent(event)
         end
@@ -14,7 +12,7 @@ module Trinidad
 
     module WebApp
       class FakeWebAppListener
-        include LifecycleListener
+        include Trinidad::Tomcat::LifecycleListener
 
         def lifecycleEvent(event)
         end

data/spec/trinidad_lifecycle_extension_spec.rb

@@ -18,29 +18,6 @@ describe 'Trinidad lifecycle extension' do
       subject.configure(@tomcat)
       @tomcat.server.findLifecycleListeners().should have(1).listener
     end
-
-    it "adds the jmx lifecycle listener when the jmx option is true" do
-      ext = Trinidad::Extensions::LifecycleServerExtension.new({:jmx => nil})
-      ext.configure(@tomcat)
-      @tomcat.server.findLifecycleListeners().should have(1).listener
-    end
-
-    it "exports jmx option when is enabled" do
-      ext = Trinidad::Extensions::LifecycleServerExtension.new({:jmx => nil})
-      ext.configure(@tomcat)
-
-      java.lang.System.get_property("com.sun.management.jmxremote").should == 'true'
-      java.lang.System.get_property("com.sun.management.jmxremote.port").should == '8181'
-    end
-
-    it "exports custom jmx option when it exists" do
-      ext = Trinidad::Extensions::LifecycleServerExtension.new({
-        :jmx => {:ssl_enabled => 'true'}
-      })
-      ext.configure(@tomcat)
-
-      java.lang.System.get_property("com.sun.management.jmxremote.ssl").should == 'true'
-    end
   end
 
   context "when it's a webapp extension" do

data/trinidad_lifecycle_extension.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'trinidad_lifecycle_extension'
-  s.version           = '0.2.0'
-  s.date              = '2010-09-26'
+  s.version           = '0.2.1'
+  s.date              = '2011-01-17'
   s.rubyforge_project = 'trinidad_lifecycle_extension'
 
   ## Make sure your summary is short. The description may be as long
@@ -51,6 +51,7 @@ Gem::Specification.new do |s|
   ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
   # = MANIFEST =
   s.files = %w[
+    History.txt
     LICENSE
     README
     Rakefile

metadata

@@ -3,18 +3,18 @@ name: trinidad_lifecycle_extension
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+    - 0
+    - 2
+    - 1
+  version: 0.2.1
 platform: ruby
 authors: 
-- David Calavera
+  - David Calavera
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-09-26 00:00:00 +02:00
+date: 2011-01-17 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -25,48 +25,47 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
-- LICENSE
+  - README
+  - LICENSE
 files: 
-- LICENSE
-- README
-- Rakefile
-- lib/trinidad_lifecycle_extension.rb
-- spec/fixtures/fake_lifecycle_listener.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/trinidad_lifecycle_extension_spec.rb
-- trinidad-libs/tomcat-catalina-jmx-remote.jar
-- trinidad_lifecycle_extension.gemspec
+  - History.txt
+  - LICENSE
+  - README
+  - Rakefile
+  - lib/trinidad_lifecycle_extension.rb
+  - spec/fixtures/fake_lifecycle_listener.rb
+  - spec/spec.opts
+  - spec/spec_helper.rb
+  - spec/trinidad_lifecycle_extension_spec.rb
+  - trinidad-libs/tomcat-catalina-jmx-remote.jar
+  - trinidad_lifecycle_extension.gemspec
 has_rdoc: true
 homepage: http://github.com/calavera/trinidad_lifecycle_extension
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset=UTF-8
+  - --charset=UTF-8
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: trinidad_lifecycle_extension
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: Add lifecycle listeners to the trinidad's server or applications