trinidad_sqlite_dbpool_extension 0.4.1 → 0.5.0

data/History.txt

@@ -1,3 +1,19 @@
+== 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
+ * support multiple jar files (and globbing) with driver path
+ * trinidad_mssql_dbpool_extension jTDS jar updated to 1.3.0
+
 == 0.4.1 (2012-11-29)
 
 * updated driver jars for following :
@@ -25,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

@@ -0,0 +1,113 @@
+# Trinidad Database Pool
+
+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
+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.
+`java.lang.UnsatisfiedLinkError` with SQLite3's JDBC driver) that JRuby inherits
+should go away when database connections are managed externally.
+
+http://tomcat.apache.org/tomcat-7.0-doc/jdbc-pool.html
+
+## Available Pools
+
+* MySQL (trinidad_mysql_dbpool_extension)
+* PostgreSQL (trinidad_postgresql_dbpool_extension)
+* SQLite (trinidad_sqlite_dbpool_extension)
+* MS-SQL (trinidad_mssql_dbpool_extension) using (unofficial) jTDS driver
+* Generic (trinidad_generic_dbpool_extension) in case your DB ain't supported
+
+## Usage
+
+* Install the gem e.g. `jruby -S gem install trinidad_mysql_dbpool_extension`
+* Configure the pool with Trinidad's configuration file e.g. :
+
+```yml
+  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
+```
+
+**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:
+
+http://tomcat.apache.org/tomcat-7.0-doc/jndi-datasource-examples-howto.html
+
+http://commons.apache.org/dbcp/configuration.html
+
+If you happen to be using *SQLite* on production you'll need an absolute path :
+
+```yml
+  extensions:
+    sqlite_dbpool:
+      jndi: jdbc/FileDB
+      url: <%= File.expand_path('db/production.db') %>
+```
+
+* Configure the (Rails) application to use JNDI with *config/database.yml*
+
+```yml
+production:
+  adapter: jdbc # it will detect the adapter spec e.g. `ArJdbc::MySQL`
+  jndi: java:/comp/env/jdbc/TestDB
+  # (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
+```
+
+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
+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
+unsure about how to get one http://developers.sun.com/product/jdbc/drivers
+
+Sample configuration for a DB2 database :
+
+```yml
+---
+  extensions:
+    generic_dbpool:                          # EXTENSION NAME AS KEY
+      jndi: 'jdbc/MyDB'                      # JNDI name
+      url: 'jdbc:db2://127.0.0.1:50000/MYDB' # specify full jdbc: URL
+      username: 'mydb'                       # database username
+      password: 'pass'                       # database password
+      driverPath: '/opt/IBM/DB2/db2jcc4.jar' # leave out if on class-path
+      driverName: com.ibm.db2.jcc.DB2Driver  # resolved from driverPath jar
+```
+
+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
+  `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
+  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
+  going to need the driver name in your *database.yml*
+
+## Copyright
+
+Copyright (c) 2013 [Team Trinidad](https://github.com/trinidad).
+See LICENSE (http://en.wikipedia.org/wiki/MIT_License) for details.

data/lib/trinidad_sqlite_dbpool_extension.rb

@@ -1,3 +1,2 @@
 require 'trinidad_dbpool'
-load File.expand_path('../../trinidad-libs/sqlite-jdbc-3.7.2.jar', __FILE__)
-require 'trinidad_sqlite_dbpool_extension/sqlite_webapp_extension'
+require 'trinidad_sqlite_dbpool_extension/sqlite_webapp_extension'

data/lib/trinidad_sqlite_dbpool_extension/sqlite_webapp_extension.rb

@@ -1,13 +1,21 @@
 module Trinidad
   module Extensions
     class SqliteDbpoolWebAppExtension < DbpoolWebAppExtension
+
       def driver_name
-        'org.sqlite.JDBC'
+        defined?(Jdbc::SQLite3.driver_name) ? Jdbc::SQLite3.driver_name :
+          'org.sqlite.JDBC'
       end
 
       def protocol
         'jdbc:sqlite://'
       end
+
+      def load_driver
+        require 'jdbc/sqlite3'
+        Jdbc::SQLite3.load_driver if defined?(Jdbc::SQLite3.load_driver)
+      end
+
     end
   end
-end
+end

metadata

@@ -1,93 +1,122 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: trinidad_sqlite_dbpool_extension
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.4.1
+version: !ruby/object:Gem::Version
+  version: 0.5.0
+  prerelease:
 platform: ruby
-authors: 
-  - Karol Bucek
-autorequire: 
+authors:
+- Karol Bucek
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-11-29 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: trinidad_dbpool
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.4.0
-    type: :runtime
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "2.10"
-    type: :development
-    version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: mocha
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0.10"
-    type: :development
-    version_requirements: *id003
+date: 2013-06-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: trinidad_dbpool
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: jdbc-sqlite3
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.7.2
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.7.2
+    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 Sqlite database pools in Trinidad
 email: self@kares.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-  - LICENSE
-  - README.rdoc
-files: 
-  - lib/trinidad_sqlite_dbpool_extension.rb
-  - lib/trinidad_sqlite_dbpool_extension/sqlite_webapp_extension.rb
-  - trinidad-libs/sqlite-jdbc-3.7.2.jar
-  - History.txt
-  - LICENSE
-  - README.rdoc
-  - Rakefile
+extra_rdoc_files:
+- README.md
+- History.txt
+- LICENSE
+files:
+- lib/trinidad_sqlite_dbpool_extension.rb
+- lib/trinidad_sqlite_dbpool_extension/sqlite_webapp_extension.rb
+- README.md
+- History.txt
+- LICENSE
 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 
-        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 
-        version: "0"
 requirements: []
-
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: Addon to support Sqlite database pools in Trinidad
 test_files: []
-

data/README.rdoc

@@ -1,94 +0,0 @@
-= trinidad-dbpool
-
-Trinidad extensions to support database connection pooling on top of the 
-underlying Apache Tomcat container.
-
-Please note, that such pools are usually configured as "global" and thus 
-shareable by multiple applications deployed on to of Trinidad server.
-
-== Available Pools
-
-* MySQL (trinidad_mysql_dbpool_extension)
-* PostgreSQL (trinidad_postgresql_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
-
-* Install the gem e.g. `jruby -S gem install trinidad_mysql_dbpool_extension`
-* Configure the pool with Trinidad's configuration file e.g. :
-
-    web_apps:
-      default:
-        extensions:
-          mysql_dbpool:                        # EXTENSION NAME AS KEY
-            jndi: 'jdbc/TestDB'                # JNDI name
-            username: 'root'                   # database username
-            password: 'root'                   # database password
-            url: 'localhost:3306/javatest'     # database URL (or full jdbc: URL)
-            maxActive: 100                     # max nodes actives
-            maxIdle: 30                        # max nodes idles
-            maxWait: 10000                     # max nodes waiting
-
-_jndi_, _username_, _password_ and _url_ are mandatory, 
-while other supported configuration options might be found here:
-
-http://tomcat.apache.org/tomcat-6.0-doc/jndi-datasource-examples-howto.html
-
-http://commons.apache.org/dbcp/configuration.html
-
-* Configure your rails application to use JNDI into the config/database.yml
-
-    production:
-      adapter: jdbc
-      jndi: java:/comp/env/jdbc/TestDB
-      driver: com.mysql.jdbc.Driver # JDBC driver is mandatory here
-
-== Generic Pool
-
-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 
-unsure about how to get one http://developers.sun.com/product/jdbc/drivers
-
-Sample configuration for a DB2 database :
-
-    ---
-      extensions:
-        generic_dbpool:                          # EXTENSION NAME AS KEY
-          jndi: 'jdbc/MyDB'                      # JNDI name
-          url: 'jdbc:db2://127.0.0.1:50000/MYDB' # specify full jdbc: URL
-          username: 'mydb'                       # database username
-          password: 'pass'                       # database password
-          driverPath: '/opt/IBM/DB2/db2jcc4.jar' # leave out if it's on class-path
-          driverName: com.ibm.db2.jcc.DB2Driver  # might resolve from driverPath
-
-Beyond standard configuration options there's 2 specific options here :
-
-* _driverPath_ should be a path to your JDBC driver archive, if you're using a
-  --libs jar folder with trinidad, might leave that out but make sure it's on 
-  the class-path for each and every deployed application that requires it.
-
-  Also in case driverPath: is ommited you'll need to specify a driverName: !
-
-* _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
-  going to need the driver name in your database.yml
-
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Send me a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2012 [Team Trinidad](https://github.com/trinidad). 
-See LICENSE (http://en.wikipedia.org/wiki/MIT_License) for details.

data/Rakefile

@@ -1,76 +0,0 @@
-require 'rubygems'
-require 'rake'
-
-def build(gem)
-  mkdir_p 'pkg'
-  sh "gem build #{gem}.gemspec"
-  mv Dir["#{gem}*.gem"].last, 'pkg'
-end
-
-def release(gem, version = nil)
-  unless `git branch` =~ /^\* master$/
-    raise "must be on master to release !"
-  end
-  
-  if version
-    unless gem_file = Dir.glob("pkg/#{gem}-#{version}.gem").first
-      raise "#{gem}-#{version}.gem not build !"
-    end
-  else
-    unless gem_file = Dir.glob("pkg/#{gem}*").sort.last
-      raise "#{gem}*.gem not build !"
-    end
-    unless match = gem_file.match(/.*?\-(\d\.\d\.\d)\.gem/)
-      raise "version number not matched from: #{gem_file}"
-    end
-    version = match[1]
-  end
-  
-  sh "git tag #{gem}-#{version}"
-  sh "git push origin master --tags"
-  sh "gem push #{gem_file}"
-end
-
-all_gems = %W{ 
-  dbpool
-  generic_dbpool_extension
-  mysql_dbpool_extension
-  postgresql_dbpool_extension
-  sqlite_dbpool_extension
-  mssql_dbpool_extension
-  oracle_dbpool_extension
-}
-all_gems.map! { |gem| "trinidad_#{gem}" }
-all_gems.each do |gem_name|
-  namespace gem_name do
-    desc "Build the #{gem_name} gem"
-    task :build do
-      build(gem_name)
-    end
-    desc "Release the #{gem_name} gem"
-    task :release => :build do
-      release(gem_name)
-    end
-  end
-end
-
-{
-  :build => 'Build all connection pool gems', 
-  :release => 'Release all connection pool gems'
-}.each do |t, d|
-  desc d
-  task t => all_gems.map { |name| "#{name}:#{t}" } # e.g. mysql_dbpool:build
-end
-
-desc "Clear out all built .gem files"
-task :clear do
-  FileUtils.rm Dir["*.gem"]
-  FileUtils.rm_r Dir["pkg/*"] if File.exist?("pkg")
-end
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.rspec_opts = ['--color', "--format documentation"]
-end
-
-task :default => :spec