Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Move driver projects up to top-level also

  • Loading branch information...
commit bb372258a3fd589d0d72fefb6df1a28d06abda0d 1 parent e881dca
@nicksieger nicksieger authored
Showing with 209 additions and 16 deletions.
  1. +2 −0  .gitignore
  2. +19 −15 .rvmrc
  3. +5 −1 Rakefile
  4. 0  {drivers/derby → jdbc-derby}/LICENSE.txt
  5. 0  {drivers/derby → jdbc-derby}/README.txt
  6. +2 −0  jdbc-derby/Rakefile
  7. +25 −0 jdbc-derby/jdbc-derby.gemspec
  8. 0  {drivers/derby → jdbc-derby}/lib/derby-10.6.2.1.jar
  9. 0  {drivers/derby → jdbc-derby}/lib/jdbc/derby.rb
  10. 0  {drivers/mysql → jdbc-h2}/History.txt
  11. 0  {drivers/h2 → jdbc-h2}/LICENSE.txt
  12. 0  {drivers/h2 → jdbc-h2}/README.txt
  13. +2 −0  jdbc-h2/Rakefile
  14. +23 −0 jdbc-h2/jdbc-h2.gemspec
  15. 0  {drivers/h2 → jdbc-h2}/lib/h2-1.3.154.jar
  16. 0  {drivers/h2 → jdbc-h2}/lib/jdbc/h2.rb
  17. 0  {drivers/jtds → jdbc-hsqldb}/History.txt
  18. 0  {drivers/hsqldb → jdbc-hsqldb}/LICENSE.txt
  19. 0  {drivers/hsqldb → jdbc-hsqldb}/README.txt
  20. +2 −0  jdbc-hsqldb/Rakefile
  21. +24 −0 jdbc-hsqldb/jdbc-hsqldb.gemspec
  22. 0  {drivers/hsqldb → jdbc-hsqldb}/lib/hsqldb-1.8.1.3.jar
  23. 0  {drivers/hsqldb → jdbc-hsqldb}/lib/jdbc/hsqldb.rb
  24. 0  {drivers/hsqldb → jdbc-jtds}/History.txt
  25. 0  {drivers/jtds → jdbc-jtds}/LICENSE.txt
  26. 0  {drivers/jtds → jdbc-jtds}/README.txt
  27. +2 −0  jdbc-jtds/Rakefile
  28. +23 −0 jdbc-jtds/jdbc-jtds.gemspec
  29. 0  {drivers/jtds → jdbc-jtds}/lib/jdbc/jtds.rb
  30. 0  {drivers/jtds → jdbc-jtds}/lib/jtds-1.2.5.jar
  31. 0  {drivers/h2 → jdbc-mysql}/History.txt
  32. 0  {drivers/mysql → jdbc-mysql}/LICENSE.txt
  33. 0  {drivers/mysql → jdbc-mysql}/README.txt
  34. +2 −0  jdbc-mysql/Rakefile
  35. +24 −0 jdbc-mysql/jdbc-mysql.gemspec
  36. 0  {drivers/mysql → jdbc-mysql}/lib/jdbc/mysql.rb
  37. 0  {drivers/mysql → jdbc-mysql}/lib/mysql-connector-java-5.1.13.jar
  38. 0  {drivers/postgres → jdbc-postgres}/History.txt
  39. 0  {drivers/postgres → jdbc-postgres}/LICENSE.txt
  40. 0  {drivers/postgres → jdbc-postgres}/README.txt
  41. +2 −0  jdbc-postgres/Rakefile
  42. +25 −0 jdbc-postgres/jdbc-postgres.gemspec
  43. 0  {drivers/postgres → jdbc-postgres}/lib/jdbc/postgres.rb
  44. 0  {drivers/postgres → jdbc-postgres}/lib/postgresql-9.0-801.jdbc3.jar
  45. 0  {drivers/postgres → jdbc-postgres}/lib/postgresql-9.0-801.jdbc4.jar
  46. 0  {drivers/sqlite3 → jdbc-sqlite3}/LICENSE.txt
  47. 0  {drivers/sqlite3 → jdbc-sqlite3}/README.txt
  48. +2 −0  jdbc-sqlite3/Rakefile
  49. +25 −0 jdbc-sqlite3/jdbc-sqlite3.gemspec
  50. 0  {drivers/sqlite3 → jdbc-sqlite3}/lib/jdbc/sqlite3.rb
  51. 0  {drivers/sqlite3 → jdbc-sqlite3}/lib/sqlite-jdbc-3.7.2.jar
View
2  .gitignore
@@ -18,3 +18,5 @@ patches*
/bin
/jndi_test/jdbc/.bindings
target
+/test/fscontext.jar
+/test/providerutil.jar
View
34 .rvmrc 100644 → 100755
@@ -4,7 +4,7 @@
# development environment upon cd'ing into the directory
# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="jruby-1.6.2@activerecord-jdbc-adapter"
+environment_ids=("jruby-head@activerecord-jdbc-adapter" "jruby@activerecord-jdbc-adapter")
#
# First we attempt to load the desired environment directly from the environment
@@ -12,22 +12,26 @@ environment_id="jruby-1.6.2@activerecord-jdbc-adapter"
# CLI and selector. If you want feedback on which environment was used then
# insert the word 'use' after --create as this triggers verbose mode.
#
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
- && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
- \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+for environment_id in ${environment_ids[*]}; do
+ if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+ && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+ then
+ \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
- if [[ -s ".rvm/hooks/after_use" ]]
- then
- . ".rvm/hooks/after_use"
- fi
-else
- # If the environment file has not yet been created, use the RVM CLI to select.
- if ! rvm --create "$environment_id"
- then
- echo "Failed to create RVM environment 'jruby-1.6.2@activerecord-jdbc-adapter'."
- fi
+ if [[ -s ".rvm/hooks/after_use" ]]
+ then
+ . ".rvm/hooks/after_use"
+ fi
+ chosen_environment=$environment_id
+ break
+ fi
+done
+
+# If the environment file has not yet been created, use the RVM CLI to select.
+if [ -z "$chosen_environment" ] && ! rvm --create ${environment_ids[1]}; then
+ echo "Failed to create RVM environment '${environment_ids[1]}'."
fi
+unset chosen_environment
#
# If you use an RVM gemset file to install a list of gems (*.gems), you can have
View
6 Rakefile
@@ -12,6 +12,7 @@ task :build => :java_compile
task :install => :java_compile
ADAPTERS = %w[derby h2 hsqldb mssql mysql postgresql sqlite3].map {|a| "activerecord-jdbc#{a}-adapter" }
+DRIVERS = %w[derby h2 hsqldb jtds mysql postgres sqlite3].map {|a| "jdbc-#{a}" }
root = File.expand_path("..", __FILE__)
version = File.read("#{root}/ARJDBC_VERSION").strip
@@ -20,7 +21,7 @@ def rake(args)
ruby "-S", "rake", *args
end
-ADAPTERS.each do |adapter|
+(ADAPTERS + DRIVERS).each do |adapter|
namespace adapter do
task :build do
@@ -47,12 +48,15 @@ end
namespace :all do
desc "Build all adapters"
+ task :build => "build"
task :build => ADAPTERS.map { |f| "#{f}:build" }
desc "Install all adapters"
+ task :install => "install"
task :install => ADAPTERS.map { |f| "#{f}:install" }
desc "Release all adapters"
+ task :release => "release"
task :release => ADAPTERS.map { |f| "#{f}:release" }
end
View
0  drivers/derby/LICENSE.txt → jdbc-derby/LICENSE.txt
File renamed without changes
View
0  drivers/derby/README.txt → jdbc-derby/README.txt
File renamed without changes
View
2  jdbc-derby/Rakefile
@@ -0,0 +1,2 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
View
25 jdbc-derby/jdbc-derby.gemspec
@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+
+$LOAD_PATH << File.expand_path('../lib', __FILE__)
+require 'jdbc/derby'
+version = Jdbc::Derby::VERSION
+Gem::Specification.new do |s|
+ s.name = %q{jdbc-derby}
+ s.version = version
+
+ s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+ s.authors = ["Nick Sieger, Ola Bini and JRuby contributors"]
+ s.date = %q{2010-10-12}
+
+ s.description = %q{Install this gem and require 'derby' within JRuby to load the driver.}
+ s.email = %q{nick@nicksieger.com, ola.bini@gmail.com}
+ s.files = [
+ "Rakefile", "README.txt", "LICENSE.txt",
+ *Dir["lib/**/*"].to_a
+ ]
+ s.homepage = %q{http://jruby-extras.rubyforge.org/ActiveRecord-JDBC}
+ s.rdoc_options = ["--main", "README.txt"]
+ s.require_paths = ["lib"]
+ s.rubyforge_project = %q{jruby-extras}
+ s.summary = %q{Derby/JavaDB JDBC driver for Java and Derby/ActiveRecord-JDBC.}
+end
View
0  drivers/derby/lib/derby-10.6.2.1.jar → jdbc-derby/lib/derby-10.6.2.1.jar
File renamed without changes
View
0  drivers/derby/lib/jdbc/derby.rb → jdbc-derby/lib/jdbc/derby.rb
File renamed without changes
View
0  drivers/mysql/History.txt → jdbc-h2/History.txt
File renamed without changes
View
0  drivers/h2/LICENSE.txt → jdbc-h2/LICENSE.txt
File renamed without changes
View
0  drivers/h2/README.txt → jdbc-h2/README.txt
File renamed without changes
View
2  jdbc-h2/Rakefile
@@ -0,0 +1,2 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
View
23 jdbc-h2/jdbc-h2.gemspec
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+
+$LOAD_PATH << File.expand_path('../lib', __FILE__)
+require 'jdbc/h2'
+version = Jdbc::H2::VERSION
+Gem::Specification.new do |s|
+ s.name = %q{jdbc-h2}
+ s.version = version
+
+ s.authors = ["Nick Sieger, Ola Bini and JRuby contributors"]
+ s.date = %q{2011-06-19}
+ s.description = %q{Install this gem and require 'h2' within JRuby to load the driver.}
+ s.email = %q{nick@nicksieger.com, ola.bini@gmail.com}
+ s.files = [
+ "Rakefile", "README.txt", "LICENSE.txt",
+ *Dir["lib/**/*"].to_a
+ ]
+ s.homepage = %q{http://jruby-extras.rubyforge.org/ActiveRecord-JDBC}
+ s.rdoc_options = ["--main", "README.txt"]
+ s.require_paths = ["lib"]
+ s.rubyforge_project = %q{jruby-extras}
+ s.summary = %q{H2 JDBC driver for Java and H2/ActiveRecord-JDBC.}
+end
View
0  drivers/h2/lib/h2-1.3.154.jar → jdbc-h2/lib/h2-1.3.154.jar
File renamed without changes
View
0  drivers/h2/lib/jdbc/h2.rb → jdbc-h2/lib/jdbc/h2.rb
File renamed without changes
View
0  drivers/jtds/History.txt → jdbc-hsqldb/History.txt
File renamed without changes
View
0  drivers/hsqldb/LICENSE.txt → jdbc-hsqldb/LICENSE.txt
File renamed without changes
View
0  drivers/hsqldb/README.txt → jdbc-hsqldb/README.txt
File renamed without changes
View
2  jdbc-hsqldb/Rakefile
@@ -0,0 +1,2 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
View
24 jdbc-hsqldb/jdbc-hsqldb.gemspec
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+
+$LOAD_PATH << File.expand_path('../lib', __FILE__)
+require 'jdbc/hsqldb'
+version = Jdbc::HSQLDB::VERSION
+Gem::Specification.new do |s|
+ s.name = %q{jdbc-hsqldb}
+ s.version = version
+
+ s.authors = ["Nick Sieger, Ola Bini and JRuby contributors"]
+ s.date = %q{2010-09-15}
+ s.description = %q{Install this gem and require 'hsqldb' within JRuby to load the driver.}
+ s.email = %q{nick@nicksieger.com, ola.bini@gmail.com}
+
+ s.files = [
+ "Rakefile", "README.txt", "LICENSE.txt",
+ *Dir["lib/**/*"].to_a
+ ]
+ s.homepage = %q{http://jruby-extras.rubyforge.org/ActiveRecord-JDBC}
+ s.rdoc_options = ["--main", "README.txt"]
+ s.require_paths = ["lib"]
+ s.rubyforge_project = %q{jruby-extras}
+ s.summary = %q{HSQLDB JDBC driver for Java and HSQLDB/ActiveRecord-JDBC.}
+end
View
0  drivers/hsqldb/lib/hsqldb-1.8.1.3.jar → jdbc-hsqldb/lib/hsqldb-1.8.1.3.jar
File renamed without changes
View
0  drivers/hsqldb/lib/jdbc/hsqldb.rb → jdbc-hsqldb/lib/jdbc/hsqldb.rb
File renamed without changes
View
0  drivers/hsqldb/History.txt → jdbc-jtds/History.txt
File renamed without changes
View
0  drivers/jtds/LICENSE.txt → jdbc-jtds/LICENSE.txt
File renamed without changes
View
0  drivers/jtds/README.txt → jdbc-jtds/README.txt
File renamed without changes
View
2  jdbc-jtds/Rakefile
@@ -0,0 +1,2 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
View
23 jdbc-jtds/jdbc-jtds.gemspec
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+
+$LOAD_PATH << File.expand_path('../lib', __FILE__)
+require 'jdbc/jtds'
+version = Jdbc::JTDS::VERSION
+Gem::Specification.new do |s|
+ s.name = %q{jdbc-jtds}
+ s.version = version
+ s.authors = ["Nick Sieger, Ola Bini and JRuby contributors"]
+ s.date = %q{2010-04-21}
+ s.description = %q{Install this gem and require 'jtds' within JRuby to load the driver.}
+ s.email = %q{nick@nicksieger.com, ola.bini@gmail.com}
+
+ s.files = [
+ "Rakefile", "README.txt", "LICENSE.txt",
+ *Dir["lib/**/*"].to_a
+ ]
+
+ s.homepage = %q{http://jruby-extras.rubyforge.org/ActiveRecord-JDBC}
+ s.rdoc_options = ["--main", "README.txt"]
+ s.require_paths = ["lib"]
+ s.rubyforge_project = %q{jruby-extras}
+end
View
0  drivers/jtds/lib/jdbc/jtds.rb → jdbc-jtds/lib/jdbc/jtds.rb
File renamed without changes
View
0  drivers/jtds/lib/jtds-1.2.5.jar → jdbc-jtds/lib/jtds-1.2.5.jar
File renamed without changes
View
0  drivers/h2/History.txt → jdbc-mysql/History.txt
File renamed without changes
View
0  drivers/mysql/LICENSE.txt → jdbc-mysql/LICENSE.txt
File renamed without changes
View
0  drivers/mysql/README.txt → jdbc-mysql/README.txt
File renamed without changes
View
2  jdbc-mysql/Rakefile
@@ -0,0 +1,2 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
View
24 jdbc-mysql/jdbc-mysql.gemspec
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+
+$LOAD_PATH << File.expand_path('../lib', __FILE__)
+require 'jdbc/mysql'
+version = Jdbc::MySQL::VERSION
+Gem::Specification.new do |s|
+ s.name = %q{jdbc-mysql}
+ s.version = version
+
+ s.authors = ["Nick Sieger, Ola Bini and JRuby contributors"]
+ s.date = %q{2010-12-08}
+ s.description = %q{Install this gem and require 'mysql' within JRuby to load the driver.}
+ s.email = %q{nick@nicksieger.com, ola.bini@gmail.com}
+
+ s.files = [
+ "Rakefile", "README.txt", "LICENSE.txt",
+ *Dir["lib/**/*"].to_a
+ ]
+ s.homepage = %q{http://jruby-extras.rubyforge.org/ActiveRecord-JDBC}
+ s.rdoc_options = ["--main", "README.txt"]
+ s.require_paths = ["lib"]
+ s.rubyforge_project = %q{jruby-extras}
+ s.summary = %q{MySQL JDBC driver for Java and MySQL/ActiveRecord-JDBC.}
+end
View
0  drivers/mysql/lib/jdbc/mysql.rb → jdbc-mysql/lib/jdbc/mysql.rb
File renamed without changes
View
0  ...mysql/lib/mysql-connector-java-5.1.13.jar → ...mysql/lib/mysql-connector-java-5.1.13.jar
File renamed without changes
View
0  drivers/postgres/History.txt → jdbc-postgres/History.txt
File renamed without changes
View
0  drivers/postgres/LICENSE.txt → jdbc-postgres/LICENSE.txt
File renamed without changes
View
0  drivers/postgres/README.txt → jdbc-postgres/README.txt
File renamed without changes
View
2  jdbc-postgres/Rakefile
@@ -0,0 +1,2 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
View
25 jdbc-postgres/jdbc-postgres.gemspec
@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+
+$LOAD_PATH << File.expand_path('../lib', __FILE__)
+require 'jdbc/postgres
+version = Jdbc::Postgres::VERSION
+Gem::Specification.new do |s|
+ s.name = %q{jdbc-postgres}
+ s.version = version
+
+ s.authors = ["Nick Sieger, Ola Bini and JRuby contributors"]
+ s.date = %q{2010-12-15}
+ s.description = %q{Install this gem and require 'postgres' within JRuby to load the driver.}
+ s.email = %q{nick@nicksieger.com, ola.bini@gmail.com}
+
+ s.files = [
+ "History.txt", "LICENSE.txt", "README.txt", "Rakefile",
+ *Dir["lib/**/*"].to_a
+ ]
+
+ s.homepage = %q{http://jruby-extras.rubyforge.org/ActiveRecord-JDBC}
+ s.rdoc_options = ["--main", "README.txt"]
+ s.require_paths = ["lib"]
+ s.rubyforge_project = %q{jruby-extras}
+ s.summary = %q{PostgreSQL JDBC driver for Java and PostgreSQL/ActiveRecord-JDBC.}
+end
View
0  drivers/postgres/lib/jdbc/postgres.rb → jdbc-postgres/lib/jdbc/postgres.rb
File renamed without changes
View
0  ...postgres/lib/postgresql-9.0-801.jdbc3.jar → ...postgres/lib/postgresql-9.0-801.jdbc3.jar
File renamed without changes
View
0  ...postgres/lib/postgresql-9.0-801.jdbc4.jar → ...postgres/lib/postgresql-9.0-801.jdbc4.jar
File renamed without changes
View
0  drivers/sqlite3/LICENSE.txt → jdbc-sqlite3/LICENSE.txt
File renamed without changes
View
0  drivers/sqlite3/README.txt → jdbc-sqlite3/README.txt
File renamed without changes
View
2  jdbc-sqlite3/Rakefile
@@ -0,0 +1,2 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
View
25 jdbc-sqlite3/jdbc-sqlite3.gemspec
@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+
+$LOAD_PATH << File.expand_path('../lib', __FILE__)
+require 'jdbc/sqlite3'
+version = Jdbc::Sqlite3::VERSION
+Gem::Specification.new do |s|
+ s.name = %q{jdbc-sqlite3}
+ s.version = version
+
+ s.authors = ["Nick Sieger, Ola Bini and JRuby contributors"]
+ s.date = %q{2011-06-16}
+ s.description = %q{Install this gem and require 'sqlite3' within JRuby to load the driver.}
+ s.email = %q{nick@nicksieger.com, ola.bini@gmail.com}
+
+ s.files = [
+ "Rakefile", "README.txt", "LICENSE.txt",
+ *Dir["lib/**/*"].to_a
+ ]
+
+ s.homepage = %q{http://jruby-extras.rubyforge.org/ActiveRecord-JDBC}
+ s.rdoc_options = ["--main", "README.txt"]
+ s.require_paths = ["lib"]
+ s.rubyforge_project = %q{jruby-extras}
+ s.summary = %q{SQLite3 JDBC driver for Java and SQLite3/ActiveRecord-JDBC.}
+end
View
0  drivers/sqlite3/lib/jdbc/sqlite3.rb → jdbc-sqlite3/lib/jdbc/sqlite3.rb
File renamed without changes
View
0  drivers/sqlite3/lib/sqlite-jdbc-3.7.2.jar → jdbc-sqlite3/lib/sqlite-jdbc-3.7.2.jar
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.