Move driver projects up to top-level also

.gitignore

@@ -18,3 +18,5 @@ patches*
 /bin
 /jndi_test/jdbc/.bindings
 target
+/test/fscontext.jar
+/test/providerutil.jar

.rvmrc

@@ -4,30 +4,34 @@
 # 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
 # file. This is very fast and efficicent compared to running through the entire
 # 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

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
 

jdbc-derby/Rakefile

@@ -0,0 +1,2 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks

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

jdbc-h2/Rakefile

@@ -0,0 +1,2 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks

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

jdbc-hsqldb/Rakefile

@@ -0,0 +1,2 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks

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

jdbc-jtds/Rakefile

@@ -0,0 +1,2 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks

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

jdbc-mysql/Rakefile

@@ -0,0 +1,2 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks

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

jdbc-postgres/Rakefile

@@ -0,0 +1,2 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks

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

jdbc-sqlite3/Rakefile

@@ -0,0 +1,2 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks

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