You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2018/09/12 18:49:22 UTC
svn commit: r1840736 - in /db/derby/code/trunk/java:
org.apache.derby.client/module-info.java
org.apache.derby.engine/module-info.java
org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java
Author: rhillegas
Date: Wed Sep 12 18:49:22 2018
New Revision: 1840736
URL: http://svn.apache.org/viewvc?rev=1840736&view=rev
Log:
DERBY-6945: Fix JDBC driver autoloading when running with a module path; commit derby-6945-54-aa-driverAutoloading.diff.
Modified:
db/derby/code/trunk/java/org.apache.derby.client/module-info.java
db/derby/code/trunk/java/org.apache.derby.engine/module-info.java
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java
Modified: db/derby/code/trunk/java/org.apache.derby.client/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.client/module-info.java?rev=1840736&r1=1840735&r2=1840736&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.client/module-info.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.client/module-info.java Wed Sep 12 18:49:22 2018
@@ -47,6 +47,12 @@ module org.apache.derby.client
with org.apache.derby.info.client.DerbyModule;
//
+ // SUPPORT JDBC AUTOLOADING
+ //
+ provides java.sql.Driver
+ with org.apache.derby.client.ClientAutoloadedDriver;
+
+ //
// ALLOW RESOURCE LOOKUP VIA REFLECTION
//
opens org.apache.derby.loc.client;
Modified: db/derby/code/trunk/java/org.apache.derby.engine/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/module-info.java?rev=1840736&r1=1840735&r2=1840736&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/module-info.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/module-info.java Wed Sep 12 18:49:22 2018
@@ -61,6 +61,12 @@ module org.apache.derby.engine
with org.apache.derby.info.engine.DerbyModule;
//
+ // SUPPORT JDBC AUTOLOADING
+ //
+ provides java.sql.Driver
+ with org.apache.derby.iapi.jdbc.AutoloadedDriver;
+
+ //
// ALLOW RESOURCE LOOKUP VIA REFLECTION
//
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java?rev=1840736&r1=1840735&r2=1840736&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java Wed Sep 12 18:49:22 2018
@@ -408,7 +408,8 @@ public class AutoloadTest extends BaseJD
{
String protocol =
getTestConfiguration().getJDBCClient().getUrlBase();
-
+
+ println("Test case '" + getName() + "'. Looking up driver for protocol " + protocol);
Driver driver = DriverManager.getDriver(protocol);
assertNotNull("Expected registered driver", driver);
}