trinidad_dbpool 0.5.0 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4f93eef63246340486ea0ecca09eb0d944cc9ca7
+  data.tar.gz: 3ec1c314d6ea8046125d506cfa364629248fffa6
+SHA512:
+  metadata.gz: 846038f43082dbcb7e5f190921227284869a078062ecbe4185ca81dc3d1b20d9074404d42f9e9d180fa6193b1bfe7486f8171c0521b3b8a40bc5b457b40b6573
+  data.tar.gz: d334c5d8ecd37cf8b9b8ae7ef910b7eb86525e63d55051ca8b855988a1516cd78d19f3661cd24e1c03a9822fe160bcb79c814e23feb5b96e6c941b044acb1e7a

data/History.txt

@@ -1,3 +1,11 @@
+== 0.7.0 (2013-12-11)
+
+**NOTE:** tomcat-dbcp.jar contains patched Commons-DBCP pool implementation !
+We're now switching to tomcat-jdbc.jar (which we kind of assumed we're using).
+
+ * packaged in tomcat-jdbc.jar (from 7.0.47) bundle version 1.1.0.1
+ * updated tomcat-dbcp.jar (keeping it for a while for compatibility)
+
 == 0.5.0 (2013-06-28)
 
  * updated tomcat-dbcp.jar to 7.0.41 ... due recent fixes in 7.0.39 / 7.0.40 :

data/README.md

@@ -29,23 +29,27 @@ http://tomcat.apache.org/tomcat-7.0-doc/jdbc-pool.html
   web_apps:
     default:
       extensions:
-        mysql_dbpool:                    # EXTENSION NAME AS KEY
-          jndi: 'jdbc/TestDB'            # name (linked with database.yml)
-          url: 'localhost:3306/javatest' # database URL (or full jdbc: URL)
-          username: 'root'               # database username
-          password: 'root'               # database password
-          maxActive: 100                 # max nodes actives
-          maxIdle: 30                    # max nodes idles
-          maxWait: 10000                 # max nodes waiting
+        mysql_dbpool:                   # EXTENSION NAME AS KEY
+          jndi: 'jdbc/MySampleDB'       # name (linked with database.yml)
+          url: 'localhost:3306/sample'  # database URL (or full jdbc: URL)
+          username: root
+          password: root
+          maxActive:  100  # maximum number of connections managed by the pool
+          initialSize: 10  # initial number of connections created in the pool
+          maxWait:  10000  # ms the pool waits for a connection to be returned
 ```
 
 **jndi**, **url** are mandatory (as well **username** and **password** if your
 database server + driver requires authentication), while other supported
-configuration options might be found here in Tomcat's "datasource" how-to:
+configuration options might be found here in Tomcat's JDBC pool documentation :
 
-http://tomcat.apache.org/tomcat-7.0-doc/jndi-datasource-examples-howto.html
+http://tomcat.apache.org/tomcat-7.0-doc/jdbc-pool.html#Common_Attributes
 
-http://commons.apache.org/dbcp/configuration.html
+**NOTE:** starting version 0.7 we switched to using Tomcat's JDBC pool which
+is simpler and more performant pool designed specifically for Tomcat/Trinidad.
+
+If you insist on using [DBCP](http://commons.apache.org/dbcp/configuration.html)
+set the (deprecated) *pool: dbcp* option along side your pool configuration ...
 
 If you happen to be using *SQLite* on production you'll need an absolute path :
 
@@ -60,11 +64,11 @@ If you happen to be using *SQLite* on production you'll need an absolute path :
 
 ```yml
 production:
-  adapter: jdbc # it will detect the adapter spec e.g. `ArJdbc::MySQL`
-  jndi: java:/comp/env/jdbc/TestDB
+  adapter: mysql
+  jndi: java:/comp/env/jdbc/MySampleDB
   # (Java) JDBC driver class name is detected for built-in adapters that
   # activerecord-jdbc-adapter supports, specify for a "generic" adapter
-  #driver: com.mysql.jdbc.Driver
+  # driver: com.mysql.jdbc.Driver
 ```
 
 do not forget to delete **pool** setup part since there's no need for it ...

data/Rakefile

@@ -26,7 +26,6 @@ all_gems = %W{
   postgresql_dbpool_extension
   sqlite_dbpool_extension
   mssql_dbpool_extension
-  oracle_dbpool_extension
 }.map { |gem| "trinidad_#{gem}" }
 
 all_gems.each do |gem_name|

data/lib/trinidad_dbpool/webapp_extension.rb

@@ -2,22 +2,35 @@ module Trinidad
   module Extensions
     class DbpoolWebAppExtension < WebAppExtension
 
-      def configure(tomcat, app_context)
+      def configure(tomcat, context)
         case @options
         when Hash
-          [create_resource(tomcat, app_context, @options)]
+          [create_resource(tomcat, context, @options)]
         when Array
-          @options.map { |opts| create_resource tomcat, app_context, opts }
+          @options.map { |opts| create_resource tomcat, context, opts }
         end
       end
 
       protected
 
-      def create_resource tomcat, app_context, options
+      def create_resource tomcat, context, options
         jndi, url = options.delete(:jndi), options.delete(:url)
         url = protocol + url unless %r{^#{protocol}} =~ url
         options[:url] = url
 
+        resource_factory = options.key?(:factory) ? options.delete(:factory) :
+          'org.apache.tomcat.jdbc.pool.DataSourceFactory'
+        if pool = options.delete(:pool) # pool: dbcp (backwards compatibility)
+          begin
+            load File.expand_path("../../../trinidad-libs/tomcat-#{pool}.jar", __FILE__)
+            resource_factory = nil
+          rescue LoadError
+            context.logger.warn "The `pool: #{pool}` option is not supported, please remove it"
+          else
+            context.logger.info "Using deprecated `pool: #{pool}` configuration option, consider removing it"
+          end
+        end
+
         load_driver
 
         driver_name = options.delete(:driver) || options.delete(:driverName) ||
@@ -31,16 +44,16 @@ module Trinidad
         #           maxActive="100" maxIdle="30" maxWait="10000"
         #           username="root" password="secret" />
         resource = Trinidad::Tomcat::ContextResource.new
-        resource.set_auth(options.delete(:auth)) if options.has_key?(:auth)
-        resource.set_description(options.delete(:description)) if options.has_key?(:description)
+        resource.set_auth(options.delete(:auth)) if options.key?(:auth)
+        resource.set_description(options.delete(:description)) if options.key?(:description)
         resource.set_name(jndi)
-        resource.set_type('javax.sql.DataSource')
-
-        options.each { |key, value| resource.set_property(key.to_s, value.to_s) }
+        resource.set_type(options.delete(:type) || 'javax.sql.DataSource')
+        resource.set_property('factory', resource_factory) if resource_factory
         resource.set_property('driverClassName', driver_name)
+        options.each { |key, value| resource.set_property(key.to_s, value.to_s) }
 
-        app_context.naming_resources.add_resource(resource)
-        app_context.naming_resources = resource.naming_resources
+        context.naming_resources.add_resource(resource)
+        context.naming_resources = resource.naming_resources
 
         resource
       end
@@ -49,4 +62,4 @@ module Trinidad
 
     end
   end
-end
+end

data/lib/trinidad_dbpool.rb

@@ -2,6 +2,6 @@ require 'java'
 
 require 'trinidad'
 require 'trinidad/jars'
-load File.expand_path('../../trinidad-libs/tomcat-dbcp.jar', __FILE__)
+load File.expand_path('../../trinidad-libs/tomcat-jdbc.jar', __FILE__)
 
 require 'trinidad_dbpool/webapp_extension'

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trinidad_dbpool
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease:
+  version: 0.7.0
 platform: ruby
 authors:
 - David Calavera
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trinidad_jars
@@ -18,29 +17,25 @@ dependencies:
     - - '>='
       - !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
@@ -50,13 +45,11 @@ dependencies:
     - - '>='
       - !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
@@ -72,12 +65,14 @@ files:
 - lib/trinidad_dbpool.rb
 - lib/trinidad_dbpool/webapp_extension.rb
 - trinidad-libs/tomcat-dbcp.jar
+- trinidad-libs/tomcat-jdbc.jar
 - README.md
 - History.txt
 - LICENSE
 - Rakefile
 homepage: http://github.com/trinidad/trinidad_dbpool_extension
 licenses: []
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -86,24 +81,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
       version: '0'
-      hash: 2
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
       version: '0'
-      hash: 2
-  none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.1.9
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: Addon to support database pools in Trinidad
 test_files: []