Diff
Modified: trunk/activerecord-jdbc/LICENSE (781 => 782)
--- trunk/activerecord-jdbc/LICENSE 2007-11-01 18:53:24 UTC (rev 781)
+++ trunk/activerecord-jdbc/LICENSE 2007-11-02 17:56:40 UTC (rev 782)
@@ -1,5 +1,5 @@
-Copyright (c) 2006 Nick Sieger <[EMAIL PROTECTED]>
-Copyright (c) 2006 Ola Bini <[EMAIL PROTECTED]>
+Copyright (c) 2006-2007 Nick Sieger <[EMAIL PROTECTED]>
+Copyright (c) 2006-2007 Ola Bini <[EMAIL PROTECTED]>
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Modified: trunk/activerecord-jdbc/Rakefile (781 => 782)
--- trunk/activerecord-jdbc/Rakefile 2007-11-01 18:53:24 UTC (rev 781)
+++ trunk/activerecord-jdbc/Rakefile 2007-11-02 17:56:40 UTC (rev 782)
@@ -37,7 +37,6 @@
puts FileList['pkg/**/*'].inspect
end
-desc "Run AR-JDBC tests"
if RUBY_PLATFORM =~ /java/
# TODO: add more databases into the standard tests here.
task :test => [:test_mysql, :test_jdbc, :test_derby, :test_hsqldb]
@@ -53,7 +52,7 @@
if driver == "derby"
files << 'test/activerecord/connection_adapters/type_conversion_test.rb'
end
- t.ruby_opts << "-r#{driver}"
+ t.ruby_opts << "-rjdbc/#{driver}"
t.test_files = files
t.libs << "test" << "#{d}/lib"
end
@@ -100,3 +99,46 @@
rescue => e
puts "ignoring error while loading hoe: #{e.to_s}"
end
+
+def rake(*args)
+ ruby "-S", "rake", *args
+end
+
+%w(test package install_gem release clean).each do |task|
+ desc "Run rake #{task} on all available adapters and drivers"
+ task "all:#{task}" => task
+end
+
+(Dir["drivers/*/Rakefile"] + Dir["adapters/*/Rakefile"]).each do |rakefile|
+ dir = File.dirname(rakefile)
+ prefix = dir.sub(%r{/}, ':')
+ tasks = %w(package install_gem clean)
+ tasks << "test" if File.directory?(File.join(dir, "test"))
+ tasks.each do |task|
+ desc "Run rake #{task} on #{dir}"
+ task "#{prefix}:#{task}" do
+ Dir.chdir(dir) do
+ rake task
+ end
+ end
+ task "all:#{task}" => "#{prefix}:#{task}"
+ end
+ desc "Run rake release on #{dir}"
+ task "#{prefix}:release" do
+ Dir.chdir(dir) do
+ if dir =~ /adapters/
+ version = ENV['VERSION']
+ else
+ Dir["dir/lib/**/*.rb"].each do |file|
+ version ||= File.open(file) {|f| f.read =~ /VERSION = "([^"]+)"/ && $1}
+ end
+ end
+ rake "release", "VERSION=#{version}"
+ end
+ end
+ # Only release adapters synchronously with main release. Drivers are versioned
+ # according to their JDBC driver versions.
+ if dir =~ /adapters/
+ task "all:release" => "#{prefix}:release"
+ end
+end
Property changes: trunk/activerecord-jdbc/adapters/derby
Name: svn:ignore
+ pkg
Manifest.txt
Added: trunk/activerecord-jdbc/adapters/derby/LICENSE.txt (0 => 782)
--- trunk/activerecord-jdbc/adapters/derby/LICENSE.txt (rev 0)
+++ trunk/activerecord-jdbc/adapters/derby/LICENSE.txt 2007-11-02 17:56:40 UTC (rev 782)
@@ -0,0 +1,21 @@
+Copyright (c) 2006-2007 Nick Sieger <[EMAIL PROTECTED]>
+Copyright (c) 2006-2007 Ola Bini <[EMAIL PROTECTED]>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Modified: trunk/activerecord-jdbc/adapters/derby/Rakefile (781 => 782)
--- trunk/activerecord-jdbc/adapters/derby/Rakefile 2007-11-01 18:53:24 UTC (rev 781)
+++ trunk/activerecord-jdbc/adapters/derby/Rakefile 2007-11-02 17:56:40 UTC (rev 782)
@@ -7,7 +7,9 @@
Rake::Task['manifest'].invoke
require File.dirname(__FILE__) + "/../../lib/jdbc_adapter/version"
-require File.dirname(__FILE__) + "/../../drivers/derby/lib/derby"
+$LOAD_PATH << File.dirname(__FILE__) + "/../../drivers/derby/lib"
+require "jdbc/derby"
+
begin
require 'hoe'
Hoe.new("activerecord-jdbcderby-adapter", JdbcAdapter::Version::VERSION) do |p|
@@ -16,11 +18,11 @@
p.author = "Nick Sieger, Ola Bini and JRuby contributors"
p.email = "[EMAIL PROTECTED], [EMAIL PROTECTED]"
p.summary = "Derby JDBC adapter for JRuby on Rails."
- p.changes = "Updated to Derby version #{DERBY_VERSION}."
+ p.changes = "Updated to Derby version #{Jdbc::Derby::VERSION}."
p.description = "Install this gem to use Derby with JRuby on Rails."
p.extra_deps += [
['activerecord-jdbc-adapter', ">= #{JdbcAdapter::Version::VERSION}"],
- ['jdbc-derby', ">= #{DERBY_VERSION}"]]
+ ['jdbc-derby', ">= #{Jdbc::Derby::VERSION}"]]
end.spec.dependencies.delete_if { |dep| dep.name == "hoe" }
rescue LoadError
puts "You really need Hoe installed to be able to package this gem"
Modified: trunk/activerecord-jdbc/adapters/derby/lib/active_record/connection_adapters/jdbcderby_adapter.rb (781 => 782)
--- trunk/activerecord-jdbc/adapters/derby/lib/active_record/connection_adapters/jdbcderby_adapter.rb 2007-11-01 18:53:24 UTC (rev 781)
+++ trunk/activerecord-jdbc/adapters/derby/lib/active_record/connection_adapters/jdbcderby_adapter.rb 2007-11-02 17:56:40 UTC (rev 782)
@@ -10,11 +10,11 @@
end
tried_gem = false
begin
- require ""
+ require "jdbc/derby"
rescue LoadError
raise if tried_gem
require 'rubygems'
- gem "activerecord-jdbc-adapter"
+ gem "jdbc-derby"
tried_gem = true
retry
end
Property changes: trunk/activerecord-jdbc/drivers/derby
Name: svn:ignore
+ pkg
Manifest.txt
Added: trunk/activerecord-jdbc/drivers/derby/LICENSE.txt (0 => 782)
--- trunk/activerecord-jdbc/drivers/derby/LICENSE.txt (rev 0)
+++ trunk/activerecord-jdbc/drivers/derby/LICENSE.txt 2007-11-02 17:56:40 UTC (rev 782)
@@ -0,0 +1 @@
+This gem bundles the Apache Derby database. Derby is available under the terms of the Apache Software License, version 2.0. See http://www.apache.org/licenses/LICENSE-2.0.txt for details.
Modified: trunk/activerecord-jdbc/drivers/derby/Rakefile (781 => 782)
--- trunk/activerecord-jdbc/drivers/derby/Rakefile 2007-11-01 18:53:24 UTC (rev 781)
+++ trunk/activerecord-jdbc/drivers/derby/Rakefile 2007-11-02 17:56:40 UTC (rev 782)
@@ -6,18 +6,17 @@
end
Rake::Task['manifest'].invoke # Always regen manifest, so Hoe has up-to-date list of files
-require File.dirname(__FILE__) + "/../../lib/jdbc_adapter/version"
$LOAD_PATH << "lib"
-require "derby"
+require "jdbc/derby"
begin
require 'hoe'
- Hoe.new("jdbc-derby", DERBY_VERSION) do |p|
+ Hoe.new("jdbc-derby", Jdbc::Derby::VERSION) do |p|
p.rubyforge_name = "jruby-extras"
p.url = ""
p.author = "Nick Sieger, Ola Bini and JRuby contributors"
p.email = "[EMAIL PROTECTED], [EMAIL PROTECTED]"
p.summary = "Derby/JavaDB JDBC driver for Java and Derby/ActiveRecord-JDBC."
- p.changes = "Updated to Derby version #{DERBY_VERSION}."
+ p.changes = "Updated to Derby version #{Jdbc::Derby::VERSION}."
p.description = "Install this gem and require 'derby' within JRuby to load the driver."
end.spec.dependencies.delete_if { |dep| dep.name == "hoe" }
rescue LoadError
Deleted: trunk/activerecord-jdbc/drivers/derby/lib/derby.rb (781 => 782)
--- trunk/activerecord-jdbc/drivers/derby/lib/derby.rb 2007-11-01 18:53:24 UTC (rev 781)
+++ trunk/activerecord-jdbc/drivers/derby/lib/derby.rb 2007-11-02 17:56:40 UTC (rev 782)
@@ -1,2 +0,0 @@
-DERBY_VERSION = "10.2.2.0"
-require "derby-#{DERBY_VERSION}.jar"
\ No newline at end of file
Copied: trunk/activerecord-jdbc/drivers/derby/lib/jdbc/derby.rb (from rev 780, trunk/activerecord-jdbc/drivers/derby/lib/derby.rb) (0 => 782)
--- trunk/activerecord-jdbc/drivers/derby/lib/jdbc/derby.rb (rev 0)
+++ trunk/activerecord-jdbc/drivers/derby/lib/jdbc/derby.rb 2007-11-02 17:56:40 UTC (rev 782)
@@ -0,0 +1,7 @@
+module Jdbc
+ module Derby
+ VERSION = "10.2.2.0"
+ end
+end
+
+require "derby-#{Jdbc::Derby::VERSION}.jar"
\ No newline at end of file
Property changes: trunk/activerecord-jdbc/drivers/hsqldb
Name: svn:ignore
+ pkg
Manifest.txt
Added: trunk/activerecord-jdbc/drivers/hsqldb/LICENSE.txt (0 => 782)
--- trunk/activerecord-jdbc/drivers/hsqldb/LICENSE.txt (rev 0)
+++ trunk/activerecord-jdbc/drivers/hsqldb/LICENSE.txt 2007-11-02 17:56:40 UTC (rev 782)
@@ -0,0 +1,2 @@
+This gem bundles the HSQLDB driver for Java. HSQL is available under the terms of the Hypersonic SQL license, see http://hsqldb.org/web/hsqlLicense.html for details.
+
Modified: trunk/activerecord-jdbc/drivers/hsqldb/Rakefile (781 => 782)
--- trunk/activerecord-jdbc/drivers/hsqldb/Rakefile 2007-11-01 18:53:24 UTC (rev 781)
+++ trunk/activerecord-jdbc/drivers/hsqldb/Rakefile 2007-11-02 17:56:40 UTC (rev 782)
@@ -7,16 +7,16 @@
Rake::Task['manifest'].invoke # Always regen manifest, so Hoe has up-to-date list of files
$LOAD_PATH << "lib"
-require "hsqldb"
+require "jdbc/hsqldb"
begin
require 'hoe'
- Hoe.new("jdbc-hsqldb", HSQLDB_VERSION) do |p|
+ Hoe.new("jdbc-hsqldb", Jdbc::HSQLDB::VERSION) do |p|
p.rubyforge_name = "jruby-extras"
p.url = ""
p.author = "Nick Sieger, Ola Bini and JRuby contributors"
p.email = "[EMAIL PROTECTED], [EMAIL PROTECTED]"
p.summary = "HSQLDB JDBC driver for Java and HSQLDB/ActiveRecord-JDBC."
- p.changes = "Updated to HSQLDB version #{HSQLDB_VERSION}."
+ p.changes = "Updated to HSQLDB version #{Jdbc::HSQLDB::VERSION}."
p.description = "Install this gem and require 'hsqldb' within JRuby to load the driver."
end.spec.dependencies.delete_if { |dep| dep.name == "hoe" }
rescue LoadError
Deleted: trunk/activerecord-jdbc/drivers/hsqldb/lib/hsqldb.rb (781 => 782)
--- trunk/activerecord-jdbc/drivers/hsqldb/lib/hsqldb.rb 2007-11-01 18:53:24 UTC (rev 781)
+++ trunk/activerecord-jdbc/drivers/hsqldb/lib/hsqldb.rb 2007-11-02 17:56:40 UTC (rev 782)
@@ -1,2 +0,0 @@
-HSQLDB_VERSION = "1.8.0.7"
-require "hsqldb-#{HSQLDB_VERSION}.jar"
\ No newline at end of file
Copied: trunk/activerecord-jdbc/drivers/hsqldb/lib/jdbc/hsqldb.rb (from rev 780, trunk/activerecord-jdbc/drivers/hsqldb/lib/hsqldb.rb) (0 => 782)
--- trunk/activerecord-jdbc/drivers/hsqldb/lib/jdbc/hsqldb.rb (rev 0)
+++ trunk/activerecord-jdbc/drivers/hsqldb/lib/jdbc/hsqldb.rb 2007-11-02 17:56:40 UTC (rev 782)
@@ -0,0 +1,6 @@
+module Jdbc
+ module HSQLDB
+ VERSION = "1.8.0.7"
+ end
+end
+require "hsqldb-#{Jdbc::HSQLDB::VERSION}.jar"
\ No newline at end of file
Modified: trunk/activerecord-jdbc/drivers/mysql/Rakefile (781 => 782)
--- trunk/activerecord-jdbc/drivers/mysql/Rakefile 2007-11-01 18:53:24 UTC (rev 781)
+++ trunk/activerecord-jdbc/drivers/mysql/Rakefile 2007-11-02 17:56:40 UTC (rev 782)
@@ -7,16 +7,16 @@
Rake::Task['manifest'].invoke # Always regen manifest, so Hoe has up-to-date list of files
$LOAD_PATH << "lib"
-require "mysql"
+require "jdbc/mysql"
begin
require 'hoe'
- Hoe.new("jdbc-mysql", MYSQL_VERSION) do |p|
+ Hoe.new("jdbc-mysql", Jdbc::MySQL::VERSION) do |p|
p.rubyforge_name = "jruby-extras"
p.url = ""
p.author = "Nick Sieger, Ola Bini and JRuby contributors"
p.email = "[EMAIL PROTECTED], [EMAIL PROTECTED]"
p.summary = "MySQL JDBC driver for Java and MySQL/ActiveRecord-JDBC."
- p.changes = "Updated to MySQL connector version #{MYSQL_VERSION}."
+ p.changes = "Updated to MySQL connector version #{Jdbc::MySQL::VERSION}."
p.description = "Install this gem and require 'mysql' within JRuby to load the driver."
end.spec.dependencies.delete_if { |dep| dep.name == "hoe" }
rescue LoadError
Copied: trunk/activerecord-jdbc/drivers/mysql/lib/jdbc/mysql.rb (from rev 780, trunk/activerecord-jdbc/drivers/mysql/lib/mysql.rb) (0 => 782)
--- trunk/activerecord-jdbc/drivers/mysql/lib/jdbc/mysql.rb (rev 0)
+++ trunk/activerecord-jdbc/drivers/mysql/lib/jdbc/mysql.rb 2007-11-02 17:56:40 UTC (rev 782)
@@ -0,0 +1,6 @@
+module Jdbc
+ module MySQL
+ VERSION = "5.0.4"
+ end
+end
+require "mysql-connector-java-#{Jdbc::MySQL::VERSION}-bin.jar"
\ No newline at end of file
Deleted: trunk/activerecord-jdbc/drivers/mysql/lib/mysql.rb (781 => 782)
--- trunk/activerecord-jdbc/drivers/mysql/lib/mysql.rb 2007-11-01 18:53:24 UTC (rev 781)
+++ trunk/activerecord-jdbc/drivers/mysql/lib/mysql.rb 2007-11-02 17:56:40 UTC (rev 782)
@@ -1,2 +0,0 @@
-MYSQL_VERSION = "5.0.4"
-require "mysql-connector-java-#{MYSQL_VERSION}-bin.jar"
\ No newline at end of file
Modified: trunk/activerecord-jdbc/drivers/postgres/Rakefile (781 => 782)
--- trunk/activerecord-jdbc/drivers/postgres/Rakefile 2007-11-01 18:53:24 UTC (rev 781)
+++ trunk/activerecord-jdbc/drivers/postgres/Rakefile 2007-11-02 17:56:40 UTC (rev 782)
@@ -7,16 +7,16 @@
Rake::Task['manifest'].invoke # Always regen manifest, so Hoe has up-to-date list of files
$LOAD_PATH << "lib"
-require "postgres"
+require "jdbc/postgres"
begin
require 'hoe'
- Hoe.new("jdbc-postgres", POSTGRES_VERSION) do |p|
+ Hoe.new("jdbc-postgres", Jdbc::Postgres::VERSION) do |p|
p.rubyforge_name = "jruby-extras"
p.url = ""
p.author = "Nick Sieger, Ola Bini and JRuby contributors"
p.email = "[EMAIL PROTECTED], [EMAIL PROTECTED]"
p.summary = "PostgreSQL JDBC driver for Java and PostgreSQL/ActiveRecord-JDBC."
- p.changes = "Updated to PostgreSQL version #{POSTGRES_VERSION}."
+ p.changes = "Updated to PostgreSQL version #{Jdbc::Postgres::VERSION}."
p.description = "Install this gem and require 'postgres' within JRuby to load the driver."
end.spec.dependencies.delete_if { |dep| dep.name == "hoe" }
rescue LoadError
Copied: trunk/activerecord-jdbc/drivers/postgres/lib/jdbc/postgres.rb (from rev 780, trunk/activerecord-jdbc/drivers/postgres/lib/postgres.rb) (0 => 782)
--- trunk/activerecord-jdbc/drivers/postgres/lib/jdbc/postgres.rb (rev 0)
+++ trunk/activerecord-jdbc/drivers/postgres/lib/jdbc/postgres.rb 2007-11-02 17:56:40 UTC (rev 782)
@@ -0,0 +1,6 @@
+module Jdbc
+ module Postgres
+ VERSION = "8.2"
+ end
+end
+require "postgresql-#{Jdbc::Postgres::VERSION}-504.jdbc3.jar"
\ No newline at end of file
Deleted: trunk/activerecord-jdbc/drivers/postgres/lib/postgres.rb (781 => 782)
--- trunk/activerecord-jdbc/drivers/postgres/lib/postgres.rb 2007-11-01 18:53:24 UTC (rev 781)
+++ trunk/activerecord-jdbc/drivers/postgres/lib/postgres.rb 2007-11-02 17:56:40 UTC (rev 782)
@@ -1,2 +0,0 @@
-POSTGRES_VERSION = "8.2"
-require "postgresql-#{POSTGRES_VERSION}-504.jdbc3.jar"
\ No newline at end of file
Modified: trunk/activerecord-jdbc/lib/active_record/connection_adapters/derby_adapter.rb (781 => 782)
--- trunk/activerecord-jdbc/lib/active_record/connection_adapters/derby_adapter.rb 2007-11-01 18:53:24 UTC (rev 781)
+++ trunk/activerecord-jdbc/lib/active_record/connection_adapters/derby_adapter.rb 2007-11-02 17:56:40 UTC (rev 782)
@@ -1,6 +1,13 @@
+tried_gem = false
begin
- require 'derby'
+ require "jdbc/derby"
rescue LoadError
- # hope that the derby jar is already present
+ unless tried_gem
+ require 'rubygems'
+ gem "jdbc-derby"
+ tried_gem = true
+ retry
+ end
+ # trust that the derby jar is already present
end
require 'active_record/connection_adapters/jdbc_adapter'
\ No newline at end of file
Modified: trunk/activerecord-jdbc/lib/active_record/connection_adapters/hsqldb_adapter.rb (781 => 782)
--- trunk/activerecord-jdbc/lib/active_record/connection_adapters/hsqldb_adapter.rb 2007-11-01 18:53:24 UTC (rev 781)
+++ trunk/activerecord-jdbc/lib/active_record/connection_adapters/hsqldb_adapter.rb 2007-11-02 17:56:40 UTC (rev 782)
@@ -1,6 +1,12 @@
+tried_gem = false
begin
- require 'hsqldb'
+ require "jdbc/hsqldb"
rescue LoadError
- # hope that the hsqldb jar is already present
-end
-require 'active_record/connection_adapters/jdbc_adapter'
\ No newline at end of file
+ unless tried_gem
+ require 'rubygems'
+ gem "jdbc-hsqldb"
+ tried_gem = true
+ retry
+ end
+ # trust that the hsqldb jar is already present
+endrequire 'active_record/connection_adapters/jdbc_adapter'
\ No newline at end of file
Modified: trunk/activerecord-jdbc/lib/active_record/connection_adapters/mysql_adapter.rb (781 => 782)
--- trunk/activerecord-jdbc/lib/active_record/connection_adapters/mysql_adapter.rb 2007-11-01 18:53:24 UTC (rev 781)
+++ trunk/activerecord-jdbc/lib/active_record/connection_adapters/mysql_adapter.rb 2007-11-02 17:56:40 UTC (rev 782)
@@ -1,6 +1,13 @@
+tried_gem = false
begin
- require 'mysql'
+ require "jdbc/mysql"
rescue LoadError
- # hope that the mysql jar is already present
+ unless tried_gem
+ require 'rubygems'
+ gem "jdbc-mysql"
+ tried_gem = true
+ retry
+ end
+ # trust that the mysql jar is already present
end
require 'active_record/connection_adapters/jdbc_adapter'
Modified: trunk/activerecord-jdbc/lib/active_record/connection_adapters/postgresql_adapter.rb (781 => 782)
--- trunk/activerecord-jdbc/lib/active_record/connection_adapters/postgresql_adapter.rb 2007-11-01 18:53:24 UTC (rev 781)
+++ trunk/activerecord-jdbc/lib/active_record/connection_adapters/postgresql_adapter.rb 2007-11-02 17:56:40 UTC (rev 782)
@@ -1,6 +1,12 @@
+tried_gem = false
begin
- require 'postgres'
+ require "jdbc/postgres"
rescue LoadError
- # hope that the postgres jar is already present
-end
-require 'active_record/connection_adapters/jdbc_adapter'
\ No newline at end of file
+ unless tried_gem
+ require 'rubygems'
+ gem "jdbc-postgres"
+ tried_gem = true
+ retry
+ end
+ # trust that the postgres jar is already present
+endrequire 'active_record/connection_adapters/jdbc_adapter'
\ No newline at end of file
Property changes: trunk/activerecord-jdbc/nbproject
Name: svn:ignore
+ private
Added: trunk/activerecord-jdbc/nbproject/project.properties (0 => 782)
--- trunk/activerecord-jdbc/nbproject/project.properties (rev 0)
+++ trunk/activerecord-jdbc/nbproject/project.properties 2007-11-02 17:56:40 UTC (rev 782)
@@ -0,0 +1,21 @@
+activerecord-jdbc-adapter2.dir=${file.reference.derby-lib-1}
+activerecord-jdbc-adapter3.dir=${file.reference.hsqldb-lib}
+activerecord-jdbc-adapter4.dir=${file.reference.mysql-lib}
+activerecord-jdbc-adapter5.dir=${file.reference.postgres-lib}
+file.reference.activerecord-jdbc-lib=lib
+file.reference.activerecord-jdbc-test=test
+file.reference.derby-lib=adapters/derby/lib
+file.reference.derby-lib-1=drivers/derby/lib
+file.reference.hsqldb-lib=drivers/hsqldb/lib
+file.reference.jruby.jar=../../maint/jruby-1_0/lib/jruby.jar
+file.reference.mysql-lib=drivers/mysql/lib
+file.reference.postgres-lib=drivers/postgres/lib
+file.reference.src-java=src/java
+java.dir=${file.reference.src-java}
+javac.classpath=
+lib.dir=${file.reference.derby-lib}
+main.file=
+ruby.includejava=false
+source.encoding=UTF-8
+src.dir=${file.reference.activerecord-jdbc-lib}
+test.src.dir=${file.reference.activerecord-jdbc-test}
Added: trunk/activerecord-jdbc/nbproject/project.xml (0 => 782)
--- trunk/activerecord-jdbc/nbproject/project.xml (rev 0)
+++ trunk/activerecord-jdbc/nbproject/project.xml 2007-11-02 17:56:40 UTC (rev 782)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+ <type>org.netbeans.modules.ruby.rubyproject</type>
+ <configuration>
+ <data xmlns="http://www.netbeans.org/ns/ruby-project/1">
+ <name>activerecord-jdbc-adapter</name>
+ <source-roots>
+ <root id="src.dir"/>
+ <root id="java.dir"/>
+ <root id="lib.dir"/>
+ <root id="activerecord-jdbc-adapter2.dir"/>
+ <root id="activerecord-jdbc-adapter3.dir"/>
+ <root id="activerecord-jdbc-adapter4.dir"/>
+ <root id="activerecord-jdbc-adapter5.dir"/>
+ </source-roots>
+ <test-roots>
+ <root id="test.src.dir"/>
+ </test-roots>
+ </data>
+ </configuration>
+</project>
Modified: trunk/activerecord-jdbc/test/db/jdbc.rb (781 => 782)
--- trunk/activerecord-jdbc/test/db/jdbc.rb 2007-11-01 18:53:24 UTC (rev 781)
+++ trunk/activerecord-jdbc/test/db/jdbc.rb 2007-11-02 17:56:40 UTC (rev 782)
@@ -1,3 +1,5 @@
+require 'jdbc/mysql'
+
config = {
:username => 'blog',
:password => '',
