trinidad 0.9.2 → 0.9.3

data/History.txt

@@ -1,3 +1,9 @@
+== 0.9.3 (2010-07-27)
+
+* Tomcat updated to version 7.0.0
+* fix TRINIDAD-9: Tomcat SSL configure options keystore and keystoreFile
+* fix TRINIDAD-10: When a web.xml is provided the tomcat's context doesn't start properly
+
 == 0.9.2 (2010-05-24)
 
 * Autoload the rackup file when it's under the directory WEB-INF.

data/README.rdoc

@@ -7,7 +7,6 @@ This project was initially called "Tomcat-rails" but due to legal issues with th
 == INSTALL:
 
   jgem install trinidad
-  jgem install calavera-trinidad -s http://gems.github.com
 
 == USAGE:
 
@@ -64,6 +63,8 @@ From the version 0.8.0 Trinidad allows to extend the server with more Tomcat fea
 * Database connection pooling: http://github.com/calavera/trinidad-dbpool
 * Daemon, run Trinidad as a daemon: http://github.com/calavera/trinidad_daemon_extension
 * Hot deploy, do hot deploys monitorizing a temporal file, ala Passenger: http://github.com/calavera/trinidad_hotdeploy_extension
+* Sandbox, management console and REST api: http://github.com/calavera/trinidad_sandbox_extension
+* Logging, enhance the Trinidad's logging system: http://github.com/calavera/trinidad_logging_extension
 
 You can find further information on how to write your own extension in the wiki: http://wiki.github.com/calavera/trinidad/extensions
 

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

data/lib/trinidad.rb

@@ -23,5 +23,4 @@ require 'trinidad/rackup_web_app'
 
 module Trinidad
   VERSION = File.read(File.expand_path('../../VERSION', __FILE__))
-  TOMCAT_VERSION = '6.0.26'
 end

data/lib/trinidad/server.rb

@@ -88,8 +88,10 @@ module Trinidad
         :SSLEnabled => 'true'
       })
 
-      if !options[:keystore] && !options[:SSLCertificateFile]
-        options[:keystore] = 'ssl/keystore'
+      options[:keystoreFile] ||= options.delete(:keystore)
+
+      if !options[:keystoreFile] && !options[:SSLCertificateFile]
+        options[:keystoreFile] = 'ssl/keystore'
         options[:keystorePass] = 'waduswadus'
       end
 
@@ -119,9 +121,10 @@ module Trinidad
     end
 
     def create_default_keystore(config)
-      return if !config[:keystore] || File.exist?(config[:keystore])
+      keystore_file_path = config[:keystoreFile]
+      return unless keystore_file_path && File.exist?(keystore_file_path)
 
-      keystore_file = java.io.File.new(config[:keystore])
+      keystore_file = java.io.File.new(keystore_file)
 
       if (!keystore_file.parent_file.exists &&
               !keystore_file.parent_file.mkdir)
@@ -134,7 +137,7 @@ module Trinidad
         "-keyalg", "RSA",
         "-validity", "365", 
         "-storepass", "key", 
-        "-keystore", config[:keystore], 
+        "-keystore", keystore_file_path,
         "-storepass", config[:keystorePass],
         "-keypass", config[:keystorePass]]
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trinidad
 version: !ruby/object:Gem::Version 
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - David Calavera
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 +02:00
+date: 2010-07-27 00:00:00 +02:00
 default_executable: trinidad
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
@@ -34,9 +37,11 @@ dependencies:
   name: jruby-rack
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 0
@@ -48,23 +53,27 @@ dependencies:
   name: trinidad_jars
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 0
-        - 2
+        - 3
         - 0
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -74,9 +83,11 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -86,9 +97,11 @@ dependencies:
   name: fakefs
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -118,6 +131,15 @@ files:
 - lib/trinidad/server.rb
 - lib/trinidad/web_app.rb
 - lib/trinidad/web_app_lifecycle_listener.rb
+- spec/fixtures/trinidad_foo_extension.rb
+- spec/fixtures/trinidad_override_tomcat_extension.rb
+- spec/spec_helper.rb
+- spec/trinidad/command_line_parser_spec.rb
+- spec/trinidad/extensions_spec.rb
+- spec/trinidad/fakeapp.rb
+- spec/trinidad/server_spec.rb
+- spec/trinidad/web_app_lifecycle_listener_spec.rb
+- spec/trinidad/web_app_spec.rb
 has_rdoc: true
 homepage: http://calavera.github.com/trinidad
 licenses: []
@@ -128,23 +150,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: trinidad
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple library to run rails applications into an embedded Tomcat