[all java] Move JRuby extensions into namespaced dir.

* Respect Ruby load path and don't keep .jar files in lib/
  but in properly-namespaced subdirectory.
* Has the knock-on effect of no longer using the base package
  in our Java classes.

Signed-off-by: Alex Coles <alex@alexcolesportfolio.com>

Author: myabc

do_derby/ext-java/src/main/java/DoDerbyExtService.java renamed to do_derby/ext-java/src/main/java/do_derby/DoDerbyExtService.java

@@ -1,5 +1,7 @@
+package do_derby;
+
+import data_objects.drivers.AbstractDataObjectsExtService;
 import data_objects.drivers.DriverDefinition;
-import do_derby.DerbyDriverDefinition;
 
 public class DoDerbyExtService extends AbstractDataObjectsExtService {
 

do_derby/lib/do_derby.rb

@@ -11,7 +11,7 @@
     require 'jdbc/derby'      # the JDBC driver, packaged as a gem
   end
 
-  require 'do_derby_ext'    # the Java extension for this DO driver
+  require 'do_derby/do_derby_ext'    # the Java extension for this DO driver
 
   # Another way of loading the JDBC Class. This seems to be more reliable
   # than Class.forName() within the data_objects.Connection Java class,

do_derby/tasks/compile.rake

@@ -11,6 +11,7 @@ begin
 
   Rake::JavaExtensionTask.new('do_derby_ext', gemspec) do |ext|
     ext.ext_dir   = 'ext-java/src/main/java'
+    ext.lib_dir   = 'lib/do_derby'
     ext.debug     = ENV.has_key?('DO_JAVA_DEBUG') && ENV['DO_JAVA_DEBUG']
     ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
     ext.java_compiling do |gem_spec|

do_h2/ext-java/src/main/java/DoH2ExtService.java renamed to do_h2/ext-java/src/main/java/do_h2/DoH2ExtService.java

@@ -1,5 +1,7 @@
+package do_h2;
+
+import data_objects.drivers.AbstractDataObjectsExtService;
 import data_objects.drivers.DriverDefinition;
-import do_h2.H2DriverDefinition;
 
 public class DoH2ExtService extends AbstractDataObjectsExtService {
 

do_h2/lib/do_h2.rb

@@ -12,7 +12,7 @@
     require 'jdbc/h2'     # the JDBC driver, packaged as a gem
    end
 
-  require 'do_h2_ext'   # the Java extension for this DO driver
+  require 'do_h2/do_h2_ext'   # the Java extension for this DO driver
 
   # Another way of loading the JDBC Class. This seems to be more reliable
   # than Class.forName() within the data_objects.Connection Java class,

do_h2/tasks/compile.rake

@@ -11,6 +11,7 @@ begin
 
   Rake::JavaExtensionTask.new('do_h2_ext', gemspec) do |ext|
     ext.ext_dir   = 'ext-java/src/main/java'
+    ext.lib_dir   = 'lib/do_h2'
     ext.debug     = ENV.has_key?('DO_JAVA_DEBUG') && ENV['DO_JAVA_DEBUG']
     ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
     ext.java_compiling do |gem_spec|

do_hsqldb/ext-java/src/main/java/DoHsqldbExtService.java renamed to do_hsqldb/ext-java/src/main/java/do_hsqldb/DoHsqldbExtService.java

@@ -1,5 +1,7 @@
+package do_hsqldb;
+
+import data_objects.drivers.AbstractDataObjectsExtService;
 import data_objects.drivers.DriverDefinition;
-import do_hsqldb.HsqldbDriverDefinition;
 
 public class DoHsqldbExtService extends AbstractDataObjectsExtService {
 

do_hsqldb/lib/do_hsqldb.rb

@@ -10,7 +10,7 @@
   rescue
     require 'jdbc/hsqldb'     # the JDBC driver, packaged as a gem
   end
-  require 'do_hsqldb_ext'   # the Java extension for this DO driver
+  require 'do_hsqldb/do_hsqldb_ext'   # the Java extension for this DO driver
 
   # Another way of loading the JDBC Class. This seems to be more reliable
   # than Class.forName() within the data_objects.Connection Java class,

do_hsqldb/tasks/compile.rake

@@ -11,6 +11,7 @@ begin
 
   Rake::JavaExtensionTask.new('do_hsqldb_ext', gemspec) do |ext|
     ext.ext_dir   = 'ext-java/src/main/java'
+    ext.lib_dir   = 'lib/do_hsqldb'
     ext.debug     = ENV.has_key?('DO_JAVA_DEBUG') && ENV['DO_JAVA_DEBUG']
     ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
     ext.java_compiling do |gem_spec|

do_jdbc/src/main/java/AbstractDataObjectsExtService.java renamed to do_jdbc/src/main/java/data_objects/drivers/AbstractDataObjectsExtService.java

@@ -1,3 +1,5 @@
+package data_objects.drivers;
+
 
 import data_objects.Command;
 import data_objects.Connection;

do_mysql/ext-java/src/main/java/DoMysqlExtService.java renamed to do_mysql/ext-java/src/main/java/do_mysql/DoMysqlExtService.java

@@ -1,5 +1,7 @@
+package do_mysql;
+
+import data_objects.drivers.AbstractDataObjectsExtService;
 import data_objects.drivers.DriverDefinition;
-import do_mysql.MySqlDriverDefinition;
 
 public class DoMysqlExtService extends AbstractDataObjectsExtService {
 

do_mysql/lib/do_mysql.rb

@@ -19,7 +19,12 @@
 
 end
 
-require 'do_mysql_ext'
+if RUBY_PLATFORM == /java/
+  require 'do_mysql/do_mysql_ext'
+else
+  # FIXME: Will be changed for MRI
+  require 'do_mysql_ext'
+end
 require 'do_mysql/version'
 require 'do_mysql/transaction' if RUBY_PLATFORM !~ /java/
 require 'do_mysql/encoding'

do_mysql/tasks/compile.rake

@@ -29,6 +29,7 @@ begin
 
   Rake::JavaExtensionTask.new('do_mysql_ext', gemspec) do |ext|
     ext.ext_dir   = 'ext-java/src/main/java'
+    ext.lib_dir   = 'lib/do_mysql'
     ext.debug     = ENV.has_key?('DO_JAVA_DEBUG') && ENV['DO_JAVA_DEBUG']
     ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
     ext.java_compiling do |gem|

do_oracle/ext-java/src/main/java/DoOracleExtService.java renamed to do_oracle/ext-java/src/main/java/do_oracle/DoOracleExtService.java

@@ -1,5 +1,7 @@
+package do_oracle;
+
+import data_objects.drivers.AbstractDataObjectsExtService;
 import data_objects.drivers.DriverDefinition;
-import do_oracle.OracleDriverDefinition;
 
 public class DoOracleExtService extends AbstractDataObjectsExtService {
 

do_oracle/lib/do_oracle.rb

@@ -7,7 +7,12 @@
   require 'oci8'
 end
 
-require 'do_oracle_ext'
+if RUBY_PLATFORM == /java/
+  require 'do_oracle/do_oracle_ext'
+else
+  # FIXME: Will be changed for MRI
+  require 'do_oracle_ext'
+end
 require File.expand_path(File.join(File.dirname(__FILE__), 'do_oracle', 'version'))
 
 if RUBY_PLATFORM =~ /java/

do_oracle/tasks/compile.rake

@@ -25,6 +25,7 @@ begin
 
   Rake::JavaExtensionTask.new('do_oracle_ext', gemspec) do |ext|
     ext.ext_dir   = 'ext-java/src/main/java'
+    ext.lib_dir   = 'lib/do_oracle'
     ext.debug     = ENV.has_key?('DO_JAVA_DEBUG') && ENV['DO_JAVA_DEBUG']
     ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
     ext.java_compiling do |gem|

do_postgres/ext-java/src/main/java/DoPostgresExtService.java renamed to do_postgres/ext-java/src/main/java/do_postgres/DoPostgresExtService.java

@@ -1,5 +1,7 @@
+package do_postgres;
+
+import data_objects.drivers.AbstractDataObjectsExtService;
 import data_objects.drivers.DriverDefinition;
-import do_postgres.PostgresDriverDefinition;
 
 public class DoPostgresExtService extends AbstractDataObjectsExtService {
 

do_postgres/lib/do_postgres.rb

@@ -17,7 +17,12 @@
 
 end
 
-require 'do_postgres_ext'
+if RUBY_PLATFORM == /java/
+  require 'do_postgres/do_postgres_ext'
+else
+  # FIXME: Will be changed for MRI
+  require 'do_postgres_ext'
+end
 require 'do_postgres/version'
 require 'do_postgres/transaction' if RUBY_PLATFORM !~ /java/
 require 'do_postgres/encoding'

do_postgres/tasks/compile.rake

@@ -33,6 +33,7 @@ begin
 
   Rake::JavaExtensionTask.new('do_postgres_ext', gemspec) do |ext|
     ext.ext_dir   = 'ext-java/src/main/java'
+    ext.lib_dir   = 'lib/do_postgres'
     ext.debug     = ENV.has_key?('DO_JAVA_DEBUG') && ENV['DO_JAVA_DEBUG']
     ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
     ext.java_compiling do |gem|

do_sqlite3/ext-java/src/main/java/DoSqlite3ExtService.java renamed to do_sqlite3/ext-java/src/main/java/do_sqlite3/DoSqlite3ExtService.java

@@ -1,6 +1,7 @@
+package do_sqlite3;
 
+import data_objects.drivers.AbstractDataObjectsExtService;
 import data_objects.drivers.DriverDefinition;
-import do_sqlite3.Sqlite3DriverDefinition;
 
 public class DoSqlite3ExtService extends AbstractDataObjectsExtService {
 

do_sqlite3/lib/do_sqlite3.rb

@@ -18,7 +18,12 @@
   java_import driver
 end
 
-require 'do_sqlite3_ext'
+if RUBY_PLATFORM == /java/
+  require 'do_sqlite3/do_sqlite3_ext'
+else
+  # FIXME: Will be changed for MRI
+  require 'do_sqlite3_ext'
+end
 require 'do_sqlite3/version'
 require 'do_sqlite3/transaction' if RUBY_PLATFORM !~ /java/
 

do_sqlite3/tasks/compile.rake

@@ -27,6 +27,7 @@ begin
 
   Rake::JavaExtensionTask.new('do_sqlite3_ext', gemspec) do |ext|
     ext.ext_dir   = 'ext-java/src/main/java'
+    ext.lib_dir   = 'lib/do_sqlite3'
     ext.debug     = ENV.has_key?('DO_JAVA_DEBUG') && ENV['DO_JAVA_DEBUG']
     ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
     ext.java_compiling do |gem|

do_sqlserver/ext-java/src/main/java/DoSqlserverExtService.java renamed to do_sqlserver/ext-java/src/main/java/do_sqlserver/DoSqlserverExtService.java

@@ -1,5 +1,7 @@
+package do_sqlserver;
+
+import data_objects.drivers.AbstractDataObjectsExtService;
 import data_objects.drivers.DriverDefinition;
-import do_sqlserver.SqlServerDriverDefinition;
 
 // this class must be named DoSqlserverExtService (and not DoSqlServerExtService)
 // for the extension to be loaded correctly (alternatively, we could add an

do_sqlserver/lib/do_sqlserver.rb

@@ -12,7 +12,7 @@
 require 'bigdecimal'
 require 'date'
 require 'base64'
-require 'do_sqlserver_ext' if RUBY_PLATFORM =~ /java/
+require 'do_sqlserver/do_sqlserver_ext' if RUBY_PLATFORM =~ /java/
 require 'do_sqlserver/version'
 # JDBC driver has transactions implementation in Java
 require 'do_sqlserver/transaction' if RUBY_PLATFORM !~ /java/

do_sqlserver/tasks/compile.rake

@@ -11,6 +11,7 @@ begin
 
   Rake::JavaExtensionTask.new('do_sqlserver_ext', gemspec) do |ext|
     ext.ext_dir   = 'ext-java/src/main/java'
+    ext.lib_dir   = 'lib/do_sqlserver'
     ext.debug     = ENV.has_key?('DO_JAVA_DEBUG') && ENV['DO_JAVA_DEBUG']
     ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
     ext.java_compiling do |gem_spec|