trinidad_dbpool 0.4.3 → 0.5.0

data/History.txt

@@ -1,3 +1,13 @@
+== 0.5.0 (2013-06-28)
+
+ * updated tomcat-dbcp.jar to 7.0.41 ... due recent fixes in 7.0.39 / 7.0.40 :
+  - major statement leak https://issues.apache.org/bugzilla/show_bug.cgi?id=54732
+ * no longer bundling driver jars instead depending on jdbc-xxx gems :
+  - trinidad_mysql_dbpool_extension -> jdbc-mysql
+  - trinidad_postgresql_dbpool_extension - jdbc-postgres
+  - trinidad_sqlite_dbpool_extension - jdbc-sqlite3
+  - trinidad_mssql_dbpool_extension - jdbc-jtds
+
 == 0.4.2 (2012-12-22)
 
  * updated tomcat-dbcp.jar to 7.0.32
@@ -31,7 +41,7 @@
 
 == 0.2.0 (2010-07-29)
 
-* Update trinidad_dbpool_extension common gem to support Tomcat 7 
+* Update trinidad_dbpool_extension common gem to support Tomcat 7
 
 == 0.1.1 (2010-05-05)
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Team Trinidad and contributors http://github.com/trinidad
+Copyright (c) 2013 Team Trinidad and contributors http://github.com/trinidad
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -21,5 +21,5 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 == JDBC Driver
 
-Included JDBC drivers are most likely distributed under different terms than 
+Included JDBC drivers are most likely distributed under different terms than
 those above, please make sure you understand your driver's license terms.

data/README.md

@@ -1,9 +1,9 @@
 # Trinidad Database Pool
 
-A bunch of Trinidad extensions to support database connection pooling on top of 
+A bunch of Trinidad extensions to support database connection pooling on top of
 the underlying Apache Tomcat container (using Tomcat's JDBC Connection Pool).
 
-Please note, that such pools are usually configured as "global" and thus 
+Please note, that such pools are usually configured as "global" and thus
 shareable by multiple applications deployed on to of the Trinidad server.
 
 Also most Java issues caused by JDBC drivers packaged with the application (e.g.
@@ -18,7 +18,6 @@ http://tomcat.apache.org/tomcat-7.0-doc/jdbc-pool.html
 * PostgreSQL (trinidad_postgresql_dbpool_extension)
 * SQLite (trinidad_sqlite_dbpool_extension)
 * MS-SQL (trinidad_mssql_dbpool_extension) using (unofficial) jTDS driver
-* Oracle (trinidad_oracle_dbpool_extension)
 * Generic (trinidad_generic_dbpool_extension) in case your DB ain't supported
 
 ## Usage
@@ -41,7 +40,7 @@ http://tomcat.apache.org/tomcat-7.0-doc/jdbc-pool.html
 ```
 
 **jndi**, **url** are mandatory (as well **username** and **password** if your
-database server + driver requires authentication), while other supported 
+database server + driver requires authentication), while other supported
 configuration options might be found here in Tomcat's "datasource" how-to:
 
 http://tomcat.apache.org/tomcat-7.0-doc/jndi-datasource-examples-howto.html
@@ -72,11 +71,11 @@ do not forget to delete **pool** setup part since there's no need for it ...
 
 ## Generic Pool
 
-If there's no "official" pool for your database, or would like to use a 
+If there's no "official" pool for your database, or would like to use a
 different version of a JDBC driver for a supported Trinidad pool, this allows
 you to completely customize a pool.
 
-NOTE: You will need a JDBC driver for your database, check the driver DB if 
+NOTE: You will need a JDBC driver for your database, check the driver DB if
 unsure about how to get one http://developers.sun.com/product/jdbc/drivers
 
 Sample configuration for a DB2 database :
@@ -96,13 +95,13 @@ Sample configuration for a DB2 database :
 Beyond standard configuration options there's 2 specific options here :
 
 * **driverPath** should be a path to your JDBC driver archive, might leave that
-  out but make sure it's on the (shared) class-path for each and every deployed 
-  application that requires it. You might specify multiple jars using the 
+  out but make sure it's on the (shared) class-path for each and every deployed
+  application that requires it. You might specify multiple jars using the
   `Dir.glob` syntax or by separating paths using the `:` separator.
 
   Also in case *driverPath* is omitted you'll need to specify a *driverName* !
 
-* **driverName** the class name implementing the JDBC driver interface, if 
+* **driverName** the class name implementing the JDBC driver interface, if
   you're not sure check the .jar for a META-INF/services/java.sql.Driver file.
   If present that file contains the class-name and you might leave *driverName*
   blank if you specified the jar path using *driverPath* but you're going still
@@ -110,5 +109,5 @@ Beyond standard configuration options there's 2 specific options here :
 
 ## Copyright
 
-Copyright (c) 2012 [Team Trinidad](https://github.com/trinidad). 
+Copyright (c) 2013 [Team Trinidad](https://github.com/trinidad).
 See LICENSE (http://en.wikipedia.org/wiki/MIT_License) for details.

data/Rakefile

@@ -19,7 +19,7 @@ task :clear do
 end
 task :clean => :clear
 
-all_gems = %W{ 
+all_gems = %W{
   dbpool
   generic_dbpool_extension
   mysql_dbpool_extension
@@ -30,14 +30,14 @@ all_gems = %W{
 }.map { |gem| "trinidad_#{gem}" }
 
 all_gems.each do |gem_name|
-  
+
   gem_helper = Bundler::GemHelper.new(Dir.pwd, gem_name)
   def gem_helper.version_tag
     "#{name}-#{version}" # override "v#{version}"
   end
   version = gem_helper.send(:version)
   version_tag = gem_helper.version_tag
-  
+
   namespace gem_name do
     desc "Build #{gem_name}-#{version}.gem into the pkg directory"
     task('build') { gem_helper.build_gem }
@@ -48,7 +48,7 @@ all_gems.each do |gem_name|
     desc "Create tag #{version_tag} and build and push #{gem_name}-#{version}.gem to Rubygems"
     task('release') { gem_helper.release_gem }
   end
-  
+
 end
 
 namespace :all do
@@ -60,18 +60,18 @@ namespace :all do
 end
 
 namespace :'tomcat-dbcp' do
-  
+
   TOMCAT_MAVEN_REPO = 'http://repo2.maven.org/maven2/org/apache/tomcat'
 
   TRINIDAD_LIBS = File.expand_path('./trinidad-libs', File.dirname(__FILE__))
 
   dbcp_jar = "tomcat-dbcp.jar"
-  
-  task :download, :version do |_, args|
-    version = [ args[:version] ]
-    
+
+  task :download, :version do |_, args| # rake tomcat-dbcp:download[7.0.41]
+    version = args[:version]
+
     dbcp_uri = "#{TOMCAT_MAVEN_REPO}/tomcat-dbcp/#{version}/tomcat-dbcp-#{version}.jar"
-    
+
     require 'open-uri'; require 'tmpdir'
 
     temp_dir = File.join(Dir.tmpdir, (Time.now.to_f * 1000).to_i.to_s)
@@ -91,7 +91,7 @@ namespace :'tomcat-dbcp' do
 
     FileUtils.rm_r temp_dir
   end
-  
+
   task :check do
     jar_path = File.join(TRINIDAD_LIBS, dbcp_jar)
     unless File.exist?(jar_path)

data/lib/trinidad_dbpool/webapp_extension.rb

@@ -1,6 +1,7 @@
 module Trinidad
   module Extensions
     class DbpoolWebAppExtension < WebAppExtension
+
       def configure(tomcat, app_context)
         case @options
         when Hash
@@ -9,18 +10,21 @@ module Trinidad
           @options.map { |opts| create_resource tomcat, app_context, opts }
         end
       end
-      
+
       protected
+
       def create_resource tomcat, app_context, options
         jndi, url = options.delete(:jndi), options.delete(:url)
         url = protocol + url unless %r{^#{protocol}} =~ url
         options[:url] = url
-        
-        driver_name = options.delete(:driver) || options.delete(:driverName) || 
+
+        load_driver
+
+        driver_name = options.delete(:driver) || options.delete(:driverName) ||
                       self.driver_name
-                    
-        # <Resource name="jdbc/MyDB" 
-        #           auth="Container" 
+
+        # <Resource name="jdbc/MyDB"
+        #           auth="Container"
         #           type="javax.sql.DataSource"
         #           url="jdbc:mysql://localhost:3306/mydb"
         #           driverClassName="com.mysql.jdbc.Driver"
@@ -40,6 +44,9 @@ module Trinidad
 
         resource
       end
+
+      def load_driver; end
+
     end
   end
-end
+end

metadata

@@ -1,101 +1,109 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: trinidad_dbpool
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.4.3
+version: !ruby/object:Gem::Version
+  version: 0.5.0
+  prerelease:
 platform: ruby
-authors: 
-  - David Calavera
-autorequire: 
+authors:
+- David Calavera
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2013-02-21 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: trinidad_jars
-    version_requirements: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.2.0
-    requirement: *id001
-    prerelease: false
-    type: :runtime
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    version_requirements: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "2.10"
-    requirement: *id002
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: mocha
-    version_requirements: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0.10"
-    requirement: *id003
-    prerelease: false
-    type: :development
+date: 2013-06-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: trinidad_jars
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.4
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.4
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '2.10'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '2.10'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: mocha
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0.10'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0.10'
+    none: false
+  prerelease: false
+  type: :development
 description: Addon to support database pools in Trinidad
 email: calavera@apache.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-  - README.md
-  - History.txt
-  - LICENSE
-  - Rakefile
-files: 
-  - lib/trinidad_dbpool.rb
-  - lib/trinidad_dbpool/webapp_extension.rb
-  - trinidad-libs/tomcat-dbcp.jar
-  - README.md
-  - History.txt
-  - LICENSE
-  - Rakefile
+extra_rdoc_files:
+- README.md
+- History.txt
+- LICENSE
+- Rakefile
+files:
+- lib/trinidad_dbpool.rb
+- lib/trinidad_dbpool/webapp_extension.rb
+- trinidad-libs/tomcat-dbcp.jar
+- README.md
+- History.txt
+- LICENSE
+- Rakefile
 homepage: http://github.com/trinidad/trinidad_dbpool_extension
 licenses: []
-
-post_install_message: 
+post_install_message:
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      segments:
+      - 0
+      version: '0'
+      hash: 2
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2
-        segments: 
-          - 0
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      segments:
+      - 0
+      version: '0'
+      hash: 2
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2
-        segments: 
-          - 0
-        version: "0"
 requirements: []
-
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: Addon to support database pools in Trinidad
 test_files: []
-