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/01/14 16:19:21 UTC
svn commit: r1821111 - in /db/derby/code/trunk: ./
java/build/org/apache/derbyBuild/lastgoodjarcontents/
java/engine/org/apache/derby/iapi/jdbc/
java/engine/org/apache/derby/impl/services/reflect/
java/engine/org/apache/derby/jdbc/ java/testing/org/apa...
Author: rhillegas
Date: Sun Jan 14 16:19:21 2018
New Revision: 1821111
URL: http://svn.apache.org/viewvc?rev=1821111&view=rev
Log:
DERBY-6945: Move AutoloadedDriver out of the public api and into the engine-internal api; commit derby-6945-11-ab-moveAutoloadedDriver.diff.
Added:
db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/AutoloadedDriver.java
- copied, changed from r1820717, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java
Removed:
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java
Modified:
db/derby/code/trunk/build.xml
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derby.jar.lastcontents
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derby.jar.lastcontents
db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/InternalDriver.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDriver.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/ShutdownWithoutDeregisterPermissionTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41Driver.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java
Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1821111&r1=1821110&r2=1821111&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Sun Jan 14 16:19:21 2018
@@ -1360,7 +1360,7 @@
<!-- declare the embedded driver for autoloading by the JDBC 4 DriverManager -->
<antcall target="declare-autoloadable-driver">
- <param name="driver.name" value="org.apache.derby.jdbc.AutoloadedDriver"/>
+ <param name="driver.name" value="org.apache.derby.iapi.jdbc.AutoloadedDriver"/>
</antcall>
<antcall target="make-core-derbyjar-manifest">
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derby.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derby.jar.lastcontents?rev=1821111&r1=1821110&r2=1821111&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derby.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derby.jar.lastcontents Sun Jan 14 16:19:21 2018
@@ -1346,7 +1346,7 @@ org.apache.derby.io.StorageFactory.class
org.apache.derby.io.StorageFile.class
org.apache.derby.io.StorageRandomAccessFile.class
org.apache.derby.io.WritableStorageFactory.class
-org.apache.derby.jdbc.AutoloadedDriver.class
+org.apache.derby.iapi.jdbc.AutoloadedDriver.class
org.apache.derby.jdbc.BasicEmbeddedConnectionPoolDataSource40.class
org.apache.derby.jdbc.BasicEmbeddedDataSource40.class
org.apache.derby.jdbc.BasicEmbeddedXADataSource40.class
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derby.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derby.jar.lastcontents?rev=1821111&r1=1821110&r2=1821111&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derby.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derby.jar.lastcontents Sun Jan 14 16:19:21 2018
@@ -1349,7 +1349,7 @@ org.apache.derby.io.StorageFactory.class
org.apache.derby.io.StorageFile.class
org.apache.derby.io.StorageRandomAccessFile.class
org.apache.derby.io.WritableStorageFactory.class
-org.apache.derby.jdbc.AutoloadedDriver.class
+org.apache.derby.iapi.jdbc.AutoloadedDriver.class
org.apache.derby.jdbc.BasicEmbeddedConnectionPoolDataSource40.class
org.apache.derby.jdbc.BasicEmbeddedDataSource40.class
org.apache.derby.jdbc.BasicEmbeddedXADataSource40.class
Copied: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/AutoloadedDriver.java (from r1820717, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/AutoloadedDriver.java?p2=db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/AutoloadedDriver.java&p1=db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java&r1=1820717&r2=1821111&rev=1821111&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/AutoloadedDriver.java Sun Jan 14 16:19:21 2018
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.jdbc.AutoloadedDriver
+ Derby - Class org.apache.derby.iapi.jdbc.AutoloadedDriver
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,7 +19,7 @@
*/
-package org.apache.derby.jdbc;
+package org.apache.derby.iapi.jdbc;
import java.sql.DriverManager;
import java.sql.Driver;
@@ -40,8 +40,6 @@ import org.apache.derby.shared.common.re
import org.apache.derby.shared.common.i18n.MessageService;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.services.monitor.Monitor;
-import org.apache.derby.iapi.jdbc.InternalDriver;
-import org.apache.derby.iapi.jdbc.JDBCBoot;
import org.apache.derby.impl.jdbc.Util;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/InternalDriver.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/InternalDriver.java?rev=1821111&r1=1821110&r2=1821111&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/InternalDriver.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/InternalDriver.java Sun Jan 14 16:19:21 2018
@@ -1,4 +1,3 @@
-
/*
Derby - Class org.apache.derby.iapi.jdbc.InternalDriver
@@ -59,7 +58,6 @@ import org.apache.derby.shared.common.re
import org.apache.derby.shared.common.reference.Property;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.security.SecurityUtil;
-import org.apache.derby.jdbc.AutoloadedDriver;
import org.apache.derby.iapi.services.context.ContextManager;
import org.apache.derby.iapi.services.context.ContextService;
import org.apache.derby.shared.common.i18n.MessageService;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java?rev=1821111&r1=1821110&r2=1821111&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java Sun Jan 14 16:19:21 2018
@@ -175,6 +175,7 @@ final class JarLoader extends SecureClas
// not make assumptions about this check reducing the
// number of classes it has to check for.
if (className.startsWith("org.apache.derby.")
+ && !isDerbyDriver(className)
&& !className.startsWith("org.apache.derby.jdbc.")
&& !className.startsWith("org.apache.derby.vti.")
&& !className.startsWith("org.apache.derby.agg.")
@@ -204,6 +205,18 @@ final class JarLoader extends SecureClas
}
}
+ /**
+ * Return true if the class is a Derby driver class which
+ * must be accessible to java.sql.DriverManager.
+ */
+ private boolean isDerbyDriver(String className)
+ {
+ return
+ (
+ className.startsWith("org.apache.derby.iapi.jdbc.AutoloadedDriver")
+ );
+ }
+
/**
*/
Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java?rev=1821111&r1=1821110&r2=1821111&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java Sun Jan 14 16:19:21 2018
@@ -41,6 +41,7 @@ import org.apache.derby.shared.common.re
import org.apache.derby.shared.common.i18n.MessageService;
import org.apache.derby.iapi.services.monitor.ModuleFactory;
import org.apache.derby.iapi.services.monitor.Monitor;
+import org.apache.derby.iapi.jdbc.AutoloadedDriver;
import org.apache.derby.iapi.jdbc.InternalDriver;
import org.apache.derby.impl.jdbc.Util;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDriver.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDriver.java?rev=1821111&r1=1821110&r2=1821111&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDriver.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDriver.java Sun Jan 14 16:19:21 2018
@@ -30,6 +30,7 @@ import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
import java.util.Properties;
import java.util.logging.Logger;
+import org.apache.derby.iapi.jdbc.AutoloadedDriver;
import org.apache.derby.iapi.jdbc.JDBCBoot;
import org.apache.derby.shared.common.reference.Attribute;
import org.apache.derby.impl.jdbc.Util;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/ShutdownWithoutDeregisterPermissionTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/ShutdownWithoutDeregisterPermissionTest.java?rev=1821111&r1=1821110&r2=1821111&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/ShutdownWithoutDeregisterPermissionTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/ShutdownWithoutDeregisterPermissionTest.java Sun Jan 14 16:19:21 2018
@@ -69,7 +69,7 @@ public class ShutdownWithoutDeregisterPe
while (found == null && drivers.hasMoreElements()) {
Driver driver = drivers.nextElement();
if (driver.getClass().getName().startsWith(
- "org.apache.derby.jdbc.AutoloadedDriver")) {
+ "org.apache.derby.iapi.jdbc.AutoloadedDriver")) {
found = driver;
}
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41Driver.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41Driver.java?rev=1821111&r1=1821110&r2=1821111&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41Driver.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41Driver.java Sun Jan 14 16:19:21 2018
@@ -25,7 +25,7 @@ import java.sql.Driver;
import java.sql.SQLException;
import java.util.logging.Logger;
-import org.apache.derby.jdbc.AutoloadedDriver;
+import org.apache.derby.iapi.jdbc.AutoloadedDriver;
import org.apache.derby.jdbc.ClientDriver;
import org.apache.derby.iapi.jdbc.InternalDriver;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java?rev=1821111&r1=1821110&r2=1821111&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java Sun Jan 14 16:19:21 2018
@@ -393,7 +393,7 @@ public class AutoloadTest extends BaseJD
}
private String getAutoloadedDriverName()
{
- return "org.apache.derby.jdbc.AutoloadedDriver";
+ return "org.apache.derby.iapi.jdbc.AutoloadedDriver";
}
private String getClientDriverName()
{