trinidad_valve_extension 0.1 → 0.2

data/README

@@ -0,0 +1,33 @@
+Trinidad Valve Extension
+========================
+
+# DESCRIPTION
+
+This is an extension to allow Tomcat valves to be configured and attached to webapps running under Trinidad.  Any valve accessible within the classpath can be used.  Built-in Tomcat valves are available without extra dependencies. A list of available built-in valves can be found at: http://tomcat.apache.org/tomcat-7.0-doc/config/valve.html
+
+# INSTALLATION
+
+jruby -S gem install trinidad_valve_extension
+
+# CONFIGURATION
+
+This extension will configure valves from a list of hashes that contain the properties that configure each valve.  'className' is used to define what valve class is being configured, just as when configuring tomcat using the traditional context.xml
+
+To enable the extension, add the 'valve' element to the 'extensions' key and define at least one valve. An example of an AccessLogValve:
+
+---
+  extensions:
+    valve:
+      valves:
+        - className: "org.apache.catalina.valves.AccessLogValve"
+          directory:      "log"
+          prefix:         "access_log"
+          fileDateFormat: ".yyyy-MM-dd"
+          suffix:         ".log"
+          pattern:        "%h %l %u %t \"%r\" %s %b %T %S"
+
+
+You can find further information on how to write your own extension in the wiki: http://wiki.github.com/calavera/trinidad/extensions
+
+# Copyright
+Copyright (c) 2011 Michael Leinartas. See LICENSE for details.

data/lib/trinidad_valve_extension.rb

@@ -1,12 +1,12 @@
 module Trinidad
   module Extensions
     module Valve
-      VERSION = '0.1'
+      VERSION = '0.2'
     end
 
     class ValveWebAppExtension < WebAppExtension
       def configure(tomcat, app_context)
-        @logger = app_context.getLogger()
+        logger = app_context.logger
 
         @options[:valves] ||= Array.new
 
@@ -16,13 +16,13 @@ module Trinidad
             class_name = valve_properties.delete 'className'
 
             if not class_name
-              logger.warn("Tomcat valve defined without a 'className' attribute.  Skipping definition: #{valve_properties.inspect}")
+              logger.warn("Tomcat valve defined without a 'className' attribute.  Skipping valve definition: '#{valve_properties.inspect}'")
               next
             end
 
             begin
               valve = get_valve(class_name)
-            rescue NameError => e,
+            rescue NameError => e
               logger.warn("Tomcat valve '#{class_name}' not found.  Ensure valve exists in your classpath")
               next
             end
@@ -30,7 +30,7 @@ module Trinidad
             set_valve_properties(valve, valve_properties)
 
             # Add the valve to the context using the suggested getPipeline()
-            app_context.getPipeline().addValve(valve)
+            app_context.pipeline.add_valve(valve)
           end
         end
       end
@@ -42,9 +42,14 @@ module Trinidad
 
       def set_valve_properties(valve_instance, properties)
         properties.each do |option,value|
-          valve_instance.send("#{option}=", value)
+          valve_instance.send("#{option}=", replace_properties(value.to_s))
         end
       end
+
+      def replace_properties(text)
+        java_import 'org.apache.tomcat.util.IntrospectionUtils'
+        IntrospectionUtils.replace_properties(text, java.lang.System.getProperties(), nil)
+      end
     end
   end
 end

data/trinidad_valve_extension.gemspec

@@ -13,7 +13,7 @@ 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_valve_extension'
-  s.version           = '0.1'
+  s.version           = '0.2'
   s.date              = '2011-08-19'
   s.rubyforge_project = 'trinidad_valve_extension'
 

metadata

@@ -1,45 +1,37 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: trinidad_valve_extension
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  version: "0.1"
+version: !ruby/object:Gem::Version
+  version: '0.2'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Michael Leinartas
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-19 00:00:00 -05:00
+date: 2011-08-19 00:00:00.000000000 -05:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: trinidad
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 0
+  requirement: &2153328980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
-  version_requirements: *id001
-description: Trinidad extension to add and configure Tomcat valves. Built-in Tomcat valves are always available but any valve existing in the classpath can be used
+  prerelease: false
+  version_requirements: *2153328980
+description: Trinidad extension to add and configure Tomcat valves. Built-in Tomcat
+  valves are always available but any valve existing in the classpath can be used
 email: mleinartas@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - LICENSE
-files: 
+files:
 - History.txt
 - LICENSE
 - README
@@ -49,32 +41,27 @@ files:
 has_rdoc: true
 homepage: http://github.com/mleinart/trinidad_valve_extension
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: trinidad_valve_extension
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 2
 summary: Trinidad extension to add and configure Tomcat valves
 test_files: []
-