trinidad 0.7.2 → 0.8.0

data/History.txt

@@ -1,3 +1,8 @@
+== 0.8.0 (??)
+
+* Support for extensions (database connection pooling is the first one using it)
+* Splitting the gem in two, the core gem and the jars gem
+
 == 0.7.0 (2009-12-01)
 
 * Support to run different applications within the same Tomcat container

data/README.rdoc

@@ -35,6 +35,14 @@ You can also specify a default web.xml to config your web application. By defaul
 
 Other advanced options can be found in the wiki: http://wiki.github.com/calavera/trinidad/advanced-configuration
 
+== EXTENSIONS:
+
+From the version 0.8.0 Trinidad allows to extend the server with more Tomcat features, here there is a list with the current available extensions:
+
+* Database connection pooling: http://github.com/calavera/trinidad-dbpool
+
+You can find further information on how to write your onw extension in the wiki: http://wiki.github.com/calavera/trinidad/extensions
+
 == Copyright
 
-Copyright (c) 2009 David Calavera<calavera@apache.org>. See LICENSE for details.
+Copyright (c) 2010 David Calavera<calavera@apache.org>. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.8.0

data/lib/trinidad.rb

@@ -3,9 +3,11 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 require "java"
 require 'rubygems'
+gem 'trinidad_jars'
 
 require 'trinidad/core_ext'
 
+require 'trinidad/extensions'
 require 'trinidad/command_line_parser'
 require 'trinidad/jars'
 require 'trinidad/server'
@@ -14,5 +16,4 @@ require 'trinidad/rails_web_app'
 require 'trinidad/rackup_web_app'
 
 module Trinidad
-  TRINIDAD_LIBS = File.dirname(__FILE__) + "/../trinidad-libs" unless defined?(TRINIDAD_LIBS)
 end

data/lib/trinidad/command_line_parser.rb

@@ -1,7 +1,8 @@
 module Trinidad
   require 'optparse'
-  
+
   class CommandLineParser
+
     def self.parse
       default_options = {
         :port => 3000,
@@ -13,7 +14,7 @@ module Trinidad
         :ssl_port => 8443,
         :ajp_port => 8009
       }
-      
+ 
       parser = OptionParser.new do |opts|
         opts.banner = 'Trinidad server default options:'
         opts.separator ''
@@ -22,22 +23,22 @@ module Trinidad
             "default: #{default_options[:environment]}") do |v| 
           default_options[:environment] = v
         end
-        
+
         opts.on('-p', '--port PORT', 'Port to bind to', 
             "default: #{default_options[:port]}") do |v| 
           default_options[:port] = v
         end
-        
+
         opts.on('-c', '--context CONTEXT_PATH', 'The application context path', 
             "default: #{default_options[:context_path]}") do |v| 
           default_options[:context_path] = v
         end
-        
+
         opts.on('--lib', '--jars LIBS_DIR', 'Directory containing jars used by the application', 
             "default: #{default_options[:libs_dir]}") do |v| 
           default_options[:libs_dir] = v
         end
-        
+
         opts.on('--classes', '--classes CLASSES_DIR', 'Directory containing classes used by the application', 
             "default: #{default_options[:classes_dir]}") do |v| 
           default_options[:classes_dir] = v
@@ -48,7 +49,7 @@ module Trinidad
           ssl_port = v.nil? ? default_options.delete(:ssl_port) : v.to_i
           default_options[:ssl] = {:port => ssl_port}
         end
-        
+
         opts.on('-a', '--ajp [AJP_PORT]', 'Enable ajp connections',
             "default port: #{default_options[:ajp_port]}") do |v|
           ajp_port = v.nil? ? default_options.delete(:ajp_port) : v.to_i
@@ -69,21 +70,21 @@ module Trinidad
         opts.on('--public', '--public DIRECTORY', 'Public directory', 'default: public') do |v|
           default_options[:public] = v
         end
-        
+
         opts.on('-v', '--version', 'display the current version') do
           puts File.read(File.join(File.dirname(__FILE__), '..', '..', 'VERSION')).chomp
           exit
         end
-        
+
         opts.on('-h', '--help', 'display the help') do
           puts opts
           exit
         end
-          
+
         opts.parse!(ARGV)
       end
-      
-        default_options
+
+      default_options
     end
   end
 end

data/lib/trinidad/core_ext.rb

@@ -30,4 +30,17 @@ Hash.class_eval do
     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
+
+class String
+  def camelize
+    self.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+  end
 end

data/lib/trinidad/extensions.rb

@@ -0,0 +1,47 @@
+module Trinidad
+  module Extensions
+    def self.configure_webapp_extensions(extensions, tomcat, app_context)
+      if extensions
+        extensions.each do |name, options|
+          extension(name, 'WebAppExtension').new(options).configure(tomcat, app_context)
+        end
+      end
+    end
+
+    def self.configure_server_extensions(extensions, tomcat)
+      if extensions
+        extensions.each do |name, options|
+          extension(name, 'ServerExtension').new(options).configure(tomcat)
+        end
+      end
+    end
+
+    def self.extension(name, type)
+      class_name = (name.to_s.camelize << type).to_sym
+      load_extension(name) unless const_defined?(class_name)
+      const_get(class_name)
+    end
+
+    def self.load_extension(name)
+      require "trinidad_#{name}_extension"
+    end
+
+    class Extension
+      def initialize(options)
+        @options = options.dup
+      end
+    end
+
+    class WebAppExtension < Extension
+      def configure(tomcat, app_context)
+        raise NotImplementedError, "#{self.class}#configure not implemented"
+      end
+    end
+
+    class ServerExtension < Extension
+      def configure(tomcat)
+        raise NotImplementedError, "#{self.class}#configure not implemented"
+      end
+    end
+  end
+end

data/lib/trinidad/server.rb

@@ -1,7 +1,9 @@
 module Trinidad
-  class Server
+  JSystem = java.lang.System
+  JContext = javax.naming.Context
 
-    attr_reader :tomcat
+  class Server
+    attr_reader :tomcat, :config
 
     def default_options
       {
@@ -23,7 +25,7 @@ module Trinidad
     end
 
     def load_config(config)
-      @config = default_options.deep_merge(config)
+      @config = default_options.deep_merge(config).symbolize!
       add_default_web_app!(@config)
     end
 
@@ -31,9 +33,12 @@ module Trinidad
       @tomcat = Trinidad::Tomcat::Tomcat.new
       @tomcat.setPort(@config[:port].to_i)
       @tomcat.setBaseDir(Dir.pwd)
+      enable_naming
 
       add_ssl_connector if ssl_enabled?
       add_ajp_connector if ajp_enabled?
+
+      Trinidad::Extensions.configure_server_extensions(@config[:extensions], @tomcat)
     end
 
     def create_web_apps
@@ -47,6 +52,7 @@ module Trinidad
 
         web_app.load_default_web_xml
         web_app.add_rack_filter
+        web_app.configure_extensions(@tomcat)
         web_app.add_context_loader
         web_app.add_init_params
         web_app.add_web_dir_resources
@@ -64,7 +70,7 @@ module Trinidad
       connector.secure = opts.delete(:secure) || false
       connector.port = opts.delete(:port).to_i
 
-      options.each do |key, value|
+      opts.each do |key, value|
         connector.setProperty(key.to_s, value.to_s)
       end
 
@@ -97,7 +103,7 @@ module Trinidad
     end
 
     def create_default_keystore(config)
-      keystore_file = java.io.File.new(config[:ssl][:keystore])
+      keystore_file = java.io.File.new(config[:keystore])
 
       if (!keystore_file.parent_file.exists() &&
               !keystore_file.parent_file.mkdir())
@@ -110,9 +116,9 @@ module Trinidad
         "-keyalg", "RSA",
         "-validity", "365", 
         "-storepass", "key", 
-        "-keystore", config[:ssl][:keystore], 
-        "-storepass", config[:ssl][:keystorePass],
-        "-keypass", config[:ssl][:keystorePass]]
+        "-keystore", config[:keystore], 
+        "-storepass", config[:keystorePass],
+        "-keypass", config[:keystorePass]]
 
       Trinidad::Tomcat::KeyTool.main(keytool_args.to_java(:string))
     end
@@ -136,5 +142,21 @@ module Trinidad
       end
     end
 
+    def enable_naming
+      @tomcat.getServer().addLifecycleListener(Trinidad::Tomcat::NamingContextListener.new)
+
+      JSystem.setProperty("catalina.useNaming", "true")
+
+      value = "org.apache.naming"
+      old_value = JSystem.getProperty(JContext.URL_PKG_PREFIXES) || value
+
+      value = value + ":" + old_value unless old_value.include?(value)
+      JSystem.setProperty(JContext.URL_PKG_PREFIXES, value)
+
+      value = JSystem.getProperty(JContext.INITIAL_CONTEXT_FACTORY)
+      unless value
+        JSystem.setProperty(JContext.INITIAL_CONTEXT_FACTORY, "org.apache.naming.java.javaURLContextFactory")
+      end
+    end
   end
 end

data/lib/trinidad/web_app.rb

@@ -1,17 +1,19 @@
 module Trinidad
   class WebApp
     attr_reader :context, :config
-  
+
     def self.create(context, config, app)
       app.has_key?(:rackup) ? RackupWebApp.new(context, config, app) : RailsWebApp.new(context, config, app)
     end
-    
+
     def initialize(context, config, app)
       @context = context
       @config = config
       @app = app
+
+      @class_loader = org.jruby.util.JRubyClassLoader.new(JRuby.runtime.jruby_class_loader)
     end
-    
+
     def add_rack_filter
       unless rack_filter_configured?
         filter_def = Trinidad::Tomcat::FilterDef.new
@@ -26,47 +28,46 @@ module Trinidad
         @context.addFilterMap(filter_map)
       end
     end
-    
+
     def add_context_loader
-      class_loader = org.jruby.util.JRubyClassLoader.new(JRuby.runtime.jruby_class_loader)
-      add_application_libs(class_loader)
-      add_application_classes(class_loader)
-      
-      loader = Trinidad::Tomcat::WebappLoader.new(class_loader)
+      add_application_libs(@class_loader)
+      add_application_classes(@class_loader)
+
+      loader = Trinidad::Tomcat::WebappLoader.new(@class_loader)
 
       loader.container = @context
       @context.loader = loader
     end
-    
+
     def add_init_params
       [:jruby_min_runtimes, :jruby_max_runtimes].each do |param|
         param_name = param.to_s.gsub(/_/, '.')
         add_parameter_unless_exist(param_name, @config[param].to_s)
       end
-      
+
       add_parameter_unless_exist('jruby.initial.runtimes', @config[:jruby_min_runtimes].to_s)
       add_parameter_unless_exist('public.root', File.join('/', public_root))
     end
-    
+
     def add_web_dir_resources
       doc_base = File.join(@app[:web_app_dir], public_root)
       @context.setDocBase(doc_base) if File.exist?(doc_base)
     end
-    
+
     def add_rack_context_listener
       unless rack_listener_configured?
         @context.addApplicationListener(context_listener)
       end
     end
-    
+
     def add_application_libs(class_loader)
       resources_dir = File.join(@app[:web_app_dir], libs_dir, '**', '*.jar')
-      
+
       Dir[resources_dir].each do |resource|
         class_loader.addURL(java.io.File.new(resource).to_url)
       end
     end
-    
+
     def add_application_classes(class_loader)
       resources_dir = File.join(@app[:web_app_dir], classes_dir)
       class_loader.addURL(java.io.File.new(resources_dir).to_url)
@@ -74,7 +75,7 @@ module Trinidad
 
     def load_default_web_xml
       default_web_xml = File.expand_path(File.join(@app[:web_app_dir], default_web_xml_file))
-      
+
       if File.exist?(default_web_xml)
         @context.setDefaultWebXml(default_web_xml)
         @context.setDefaultContextXml(default_web_xml)
@@ -126,5 +127,15 @@ module Trinidad
     def add_parameter_unless_exist(name, value)
       @context.addParameter(name, value) unless @context.findParameter(name)
     end
+
+    def load_extensions?
+      @app.has_key?(:extensions)
+    end
+
+    def configure_extensions(tomcat)
+      return unless load_extensions?
+
+      Trinidad::Extensions.configure_webapp_extensions(@app[:extensions], tomcat, @context)
+    end 
   end
 end

data/spec/fixtures/foo.rb

@@ -0,0 +1,15 @@
+module Trinidad
+  module Extensions
+  class FooWebAppExtension < WebAppExtension
+    def configure(tomcat, app_context)
+      @options
+    end
+  end
+
+  class FooServerExtension < ServerExtension
+    def configure(tomcat)
+      @options
+    end
+  end
+  end
+end

data/spec/fixtures/trinidad_foo_extension.rb

@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/foo'

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ end
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 $:.unshift(File.dirname(__FILE__) + '/../trinidad-libs')
+$:.unshift(File.dirname(__FILE__) + '/fixtures')
 
 require 'java'
 require 'trinidad'
@@ -17,4 +18,4 @@ Spec::Runner.configure do |config|
   config.mock_with :mocha
 end
 
-MOCK_WEB_APP_DIR = File.join(File.dirname(__FILE__), 'web_app_mock')
+MOCK_WEB_APP_DIR = File.join(File.dirname(__FILE__), 'web_app_mock')

data/spec/trinidad/extensions_spec.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'optparse'
+
+describe Trinidad::Extensions do
+
+  before(:each) do
+    @extensions = {:foo => {:bar => :bazz}}
+  end
+
+  it "configures the server with new stuff" do
+    lambda {Trinidad::Extensions.configure_server_extensions(@extensions, nil)}.should_not raise_error
+    lambda {Trinidad::Extensions.const_get(:FooServerExtension)}.should_not raise_error
+  end
+
+  it "configures the webapp with new stuff" do
+    lambda {Trinidad::Extensions.configure_webapp_extensions(@extensions, nil, nil)}.should_not raise_error
+    lambda {Trinidad::Extensions.const_get(:FooWebAppExtension)}.should_not raise_error
+  end
+end

data/spec/trinidad/server_spec.rb

@@ -1,7 +1,22 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
+JSystem = java.lang.System
+JContext = javax.naming.Context
+
 describe Trinidad::Server do
 
+  it "always uses symbols as configuration keys" do
+    server = Trinidad::Server.new({'port' => 4000})
+    server.config[:port].should == 4000
+  end
+
+  it "enables catalina naming" do
+    Trinidad::Server.new
+    JSystem.getProperty(JContext.URL_PKG_PREFIXES).should  include("org.apache.naming")
+    JSystem.getProperty(JContext.INITIAL_CONTEXT_FACTORY).should == "org.apache.naming.java.javaURLContextFactory"
+    JSystem.getProperty("catalina.useNaming").should == "true"
+  end
+
   it "should have ssl disabled when config param is nil" do
     server = Trinidad::Server.new
     server.ssl_enabled?.should == false

metadata

@@ -1,113 +1,129 @@
 --- !ruby/object:Gem::Specification 
 name: trinidad
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  prerelease: false
+  segments: 
+  - 0
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
-  - David Calavera
+- David Calavera
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 +01:00
+date: 2010-04-04 00:00:00 +02:00
 default_executable: trinidad
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: rack
-    type: :runtime
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "1.0"
-      version: 
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    type: :development
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-      version: 
-  - !ruby/object:Gem::Dependency 
-    name: mocha
-    type: :development
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-      version: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: trinidad_jars
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: 
 email: calavera@apache.org
 executables: 
-  - trinidad
+- trinidad
 extensions: []
 
 extra_rdoc_files: 
-  - LICENSE
-  - README.rdoc
+- LICENSE
+- README.rdoc
 files: 
-  - History.txt
-  - LICENSE
-  - README.rdoc
-  - Rakefile
-  - VERSION
-  - bin/trinidad
-  - lib/trinidad.rb
-  - lib/trinidad/command_line_parser.rb
-  - lib/trinidad/core_ext.rb
-  - lib/trinidad/jars.rb
-  - lib/trinidad/rackup_web_app.rb
-  - lib/trinidad/rails_web_app.rb
-  - lib/trinidad/server.rb
-  - lib/trinidad/web_app.rb
-  - trinidad-libs/core-3.1.1.jar
-  - trinidad-libs/jasper-el.jar
-  - trinidad-libs/jasper-jdt.jar
-  - trinidad-libs/jasper.jar
-  - trinidad-libs/jetty-util-6.1.14.jar
-  - trinidad-libs/jruby-rack-0.9.5.jar
-  - trinidad-libs/jsp-2.1.jar
-  - trinidad-libs/jsp-api-2.1.jar
-  - trinidad-libs/servlet-api-2.5-6.1.14.jar
-  - trinidad-libs/tomcat-core.jar
-  - trinidad-libs/tomcat-dbcp.jar
-  - trinidad-libs/tomcat-jasper.jar
+- History.txt
+- LICENSE
+- README.rdoc
+- VERSION
+- bin/trinidad
+- lib/trinidad.rb
+- lib/trinidad/command_line_parser.rb
+- lib/trinidad/core_ext.rb
+- lib/trinidad/extensions.rb
+- lib/trinidad/rackup_web_app.rb
+- lib/trinidad/rails_web_app.rb
+- lib/trinidad/server.rb
+- lib/trinidad/web_app.rb
 has_rdoc: true
 homepage: http://calavera.github.com/trinidad
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-  - --charset=UTF-8
+- --charset=UTF-8
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  version: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  version: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: trinidad
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Simple library to run rails applications into an embedded Tomcat
 test_files: 
-  - spec/spec_helper.rb
-  - spec/trinidad/command_line_parser_spec.rb
-  - spec/trinidad/server_spec.rb
-  - spec/trinidad/web_app_spec.rb
+- spec/fixtures/foo.rb
+- spec/fixtures/trinidad_foo_extension.rb
+- spec/spec_helper.rb
+- spec/trinidad/command_line_parser_spec.rb
+- spec/trinidad/extensions_spec.rb
+- spec/trinidad/server_spec.rb
+- spec/trinidad/web_app_spec.rb

data/Rakefile

@@ -1,83 +0,0 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "trinidad"
-    gem.summary = %Q{Simple library to run rails applications into an embedded Tomcat}
-    gem.email = "calavera@apache.org"
-    gem.homepage = "http://calavera.github.com/trinidad"
-    gem.authors = ["David Calavera"]
-    gem.rubyforge_project = 'trinidad'
-
-    gem.files = FileList['bin/*', 'lib/**/*.rb', 'trinidad-libs/*.jar', 'History.txt', 'LICENSE', 'Rakefile', 'README.rdoc', 'VERSION']      
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-    gem.add_dependency 'rack', '>=1.0'
-
-    gem.add_development_dependency 'rspec'
-    gem.add_development_dependency 'mocha'
-  end
-
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_opts = ['--options', "spec/spec.opts"]
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_opts = ['--options', "spec/spec.opts"]
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION.yml')
-    config = YAML.load(File.read('VERSION.yml'))
-    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "trinidad #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-begin
-  require 'rake/contrib/sshpublisher'
-  namespace :rubyforge do
-
-    desc "Release gem and RDoc documentation to RubyForge"
-    task :release => ["rubyforge:release:gem"]
-
-    namespace :release do
-      desc "Publish RDoc to RubyForge."
-      task :docs => [:rdoc] do
-        config = YAML.load(
-            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-        )
-
-        host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/trinidad/"
-        local_dir = 'rdoc'
-
-        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-      end
-    end
-  end
-rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
-end
-

data/lib/trinidad/jars.rb

@@ -1,29 +0,0 @@
-module Trinidad
-  
-  require "servlet-api-2.5-6.1.14"
-  require "core-3.1.1"
-  require "jsp-api-2.1"
-  require "jsp-2.1"
-  require 'tomcat-core'
-  require 'jetty-util-6.1.14'
-  
-  require "jruby-rack-0.9.5"
-  
-  module Tomcat
-    include_package 'org.apache.catalina'
-    include_package 'org.apache.catalina.startup'
-    include_package 'org.apache.catalina.core'
-    include_package 'org.apache.catalina.deploy'
-    include_package 'org.apache.catalina.loader'
-    
-    include_package 'org.apache.naming.resources'
-    
-    import 'org.apache.catalina.connector.Connector'
-    import 'sun.security.tools.KeyTool'
-  end
-  
-  module Rack
-    include_package "org.jruby.rack"
-    include_package "org.jruby.rack.rails"
-  end
-end