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/09 02:03:24 UTC
svn commit: r1820615 - in /db/derby/code/trunk/java:
build/org/apache/derbyBuild/lastgoodjarcontents/
drda/org/apache/derby/impl/drda/ engine/org/apache/derby/catalog/
engine/org/apache/derby/iapi/jdbc/ engine/org/apache/derby/impl/db/
engine/org/apach...
Author: rhillegas
Date: Tue Jan 9 02:03:24 2018
New Revision: 1820615
URL: http://svn.apache.org/viewvc?rev=1820615&view=rev
Log:
DERBY-6945: Move InternalDriver out of public api package and into an engine-only api package; commit derby-6945-09-ab-moveInternalDriver.diff.
Added:
db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/InternalDriver.java
- copied, changed from r1820411, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/InternalDriver.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBC.java
- copied, changed from r1820411, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/JDBC.java
Removed:
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/InternalDriver.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/JDBC.java
Modified:
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/drda/org/apache/derby/impl/drda/DRDAConnThread.java
db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/db/SlaveDatabase.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ConnectionChild.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBStoredProcedure.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NativeAuthenticationServiceImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver42.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDriver.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource.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/ConcurrentAutoloadTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/RollBackWrappingWhenFailOnImportTest.java
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=1820615&r1=1820614&r2=1820615&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 Tue Jan 9 02:03:24 2018
@@ -70,6 +70,8 @@ org.apache.derby.iapi.jdbc.EnginePrepare
org.apache.derby.iapi.jdbc.EngineResultSet.class
org.apache.derby.iapi.jdbc.EngineStatement.class
org.apache.derby.iapi.jdbc.FailedProperties40.class
+org.apache.derby.iapi.jdbc.InternalDriver.class
+org.apache.derby.iapi.jdbc.JDBC.class
org.apache.derby.iapi.jdbc.JDBCBoot.class
org.apache.derby.iapi.jdbc.ResourceAdapter.class
org.apache.derby.iapi.security.Securable.class
@@ -1361,8 +1363,6 @@ org.apache.derby.jdbc.EmbeddedDriver.cla
org.apache.derby.jdbc.EmbeddedXADataSource.class
org.apache.derby.jdbc.EmbeddedXADataSource40.class
org.apache.derby.jdbc.EmbeddedXADataSourceInterface.class
-org.apache.derby.jdbc.InternalDriver.class
-org.apache.derby.jdbc.JDBC.class
org.apache.derby.jdbc.ReferenceableDataSource.class
org.apache.derby.jdbc.ResourceAdapterImpl.class
org.apache.derby.jdbc.XAStatementControl.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=1820615&r1=1820614&r2=1820615&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 Tue Jan 9 02:03:24 2018
@@ -70,6 +70,8 @@ org.apache.derby.iapi.jdbc.EnginePrepare
org.apache.derby.iapi.jdbc.EngineResultSet.class
org.apache.derby.iapi.jdbc.EngineStatement.class
org.apache.derby.iapi.jdbc.FailedProperties40.class
+org.apache.derby.iapi.jdbc.InternalDriver.class
+org.apache.derby.iapi.jdbc.JDBC.class
org.apache.derby.iapi.jdbc.JDBCBoot.class
org.apache.derby.iapi.jdbc.ResourceAdapter.class
org.apache.derby.iapi.security.Securable.class
@@ -1364,8 +1366,6 @@ org.apache.derby.jdbc.EmbeddedDriver.cla
org.apache.derby.jdbc.EmbeddedXADataSource.class
org.apache.derby.jdbc.EmbeddedXADataSource40.class
org.apache.derby.jdbc.EmbeddedXADataSourceInterface.class
-org.apache.derby.jdbc.InternalDriver.class
-org.apache.derby.jdbc.JDBC.class
org.apache.derby.jdbc.ReferenceableDataSource.class
org.apache.derby.jdbc.ResourceAdapterImpl.class
org.apache.derby.jdbc.XAStatementControl.class
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java?rev=1820615&r1=1820614&r2=1820615&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java Tue Jan 9 02:03:24 2018
@@ -70,7 +70,7 @@ import org.apache.derby.shared.common.st
import org.apache.derby.iapi.tools.i18n.LocalizedResource;
import org.apache.derby.iapi.util.StringUtil;
import org.apache.derby.impl.jdbc.Util;
-import org.apache.derby.jdbc.InternalDriver;
+import org.apache.derby.iapi.jdbc.InternalDriver;
/**
* This class translates DRDA protocol from an application requester to JDBC
Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java?rev=1820615&r1=1820614&r2=1820615&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java Tue Jan 9 02:03:24 2018
@@ -68,7 +68,7 @@ import org.apache.derby.impl.sql.catalog
import org.apache.derby.impl.sql.catalog.XPLAINStatementDescriptor;
import org.apache.derby.impl.sql.catalog.XPLAINStatementTimingsDescriptor;
import org.apache.derby.impl.sql.execute.JarUtil;
-import org.apache.derby.jdbc.InternalDriver;
+import org.apache.derby.iapi.jdbc.InternalDriver;
import org.apache.derby.iapi.store.access.TransactionController;
import org.apache.derby.iapi.sql.dictionary.AliasDescriptor;
import org.apache.derby.iapi.sql.dictionary.DataDictionary;
Copied: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/InternalDriver.java (from r1820411, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/InternalDriver.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/InternalDriver.java?p2=db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/InternalDriver.java&p1=db/derby/code/trunk/java/engine/org/apache/derby/jdbc/InternalDriver.java&r1=1820411&r2=1820615&rev=1820615&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/InternalDriver.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/InternalDriver.java Tue Jan 9 02:03:24 2018
@@ -1,7 +1,7 @@
/*
- Derby - Class org.apache.derby.jdbc.InternalDriver
+ Derby - Class org.apache.derby.iapi.jdbc.InternalDriver
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -20,7 +20,7 @@
*/
-package org.apache.derby.jdbc;
+package org.apache.derby.iapi.jdbc;
import java.security.AccessController;
import java.security.AccessControlException;
@@ -53,17 +53,13 @@ import java.util.logging.Logger;
import javax.sql.PooledConnection;
import javax.sql.XAConnection;
import org.apache.derby.shared.common.error.StandardException;
-import org.apache.derby.iapi.jdbc.AuthenticationService;
-import org.apache.derby.iapi.jdbc.BrokeredConnection;
-import org.apache.derby.iapi.jdbc.BrokeredConnectionControl;
-import org.apache.derby.iapi.jdbc.ConnectionContext;
-import org.apache.derby.iapi.jdbc.ResourceAdapter;
import org.apache.derby.shared.common.reference.Attribute;
import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.shared.common.reference.Module;
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;
@@ -816,32 +812,11 @@ public class InternalDriver implements M
/**
* Return a new BrokeredConnection for this implementation.
*/
- BrokeredConnection newBrokeredConnection(
+ public BrokeredConnection newBrokeredConnection(
BrokeredConnectionControl control) throws SQLException {
return new BrokeredConnection(control);
}
- /**
- * Create and return an EmbedPooledConnection from the received instance of
- * EmbeddedDataSource.
- */
- protected PooledConnection getNewPooledConnection(
- BasicEmbeddedDataSource40 eds, String user, String password,
- boolean requestPassword) throws SQLException {
- return new EmbedPooledConnection(eds, user, password, requestPassword);
- }
-
- /**
- * Create and return an EmbedXAConnection from the received instance of
- * BasicEmbeddedDataSource40.
- */
- protected XAConnection getNewXAConnection(
- BasicEmbeddedDataSource40 eds, ResourceAdapter ra,
- String user, String password, boolean requestPassword)
- throws SQLException {
- return new EmbedXAConnection(eds, ra, user, password, requestPassword);
- }
-
private static final String[] BOOLEAN_CHOICES = {"false", "true"};
/**
@@ -982,7 +957,7 @@ public class InternalDriver implements M
* @param deregister whether or not {@code AutoloadedDriver} should
* deregister itself
*/
- static void setDeregister(boolean deregister) {
+ public static void setDeregister(boolean deregister) {
InternalDriver.deregister = deregister;
}
@@ -992,7 +967,7 @@ public class InternalDriver implements M
*
* @return the deregister value
*/
- static boolean getDeregister() {
+ public static boolean getDeregister() {
return InternalDriver.deregister;
}
Copied: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBC.java (from r1820411, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/JDBC.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBC.java?p2=db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBC.java&p1=db/derby/code/trunk/java/engine/org/apache/derby/jdbc/JDBC.java&r1=1820411&r2=1820615&rev=1820615&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/JDBC.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBC.java Tue Jan 9 02:03:24 2018
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.jdbc.JDBC
+ Derby - Class org.apache.derby.iapi.jdbc.JDBC
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,10 +19,11 @@
*/
-package org.apache.derby.jdbc;
+package org.apache.derby.iapi.jdbc;
import java.sql.SQLException;
+import org.apache.derby.iapi.jdbc.InternalDriver;
import org.apache.derby.shared.common.info.JVMInfo;
import org.apache.derby.mbeans.JDBCMBean;
@@ -31,10 +32,10 @@ import org.apache.derby.mbeans.JDBCMBean
* about the JDBC driver.
*
*/
-final class JDBC implements JDBCMBean
+public final class JDBC implements JDBCMBean
{
private final InternalDriver driver;
- JDBC(InternalDriver driver)
+ public JDBC(InternalDriver driver)
{
this.driver = driver;
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java?rev=1820615&r1=1820614&r2=1820615&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java Tue Jan 9 02:03:24 2018
@@ -24,10 +24,13 @@ package org.apache.derby.iapi.jdbc;
import java.io.PrintWriter;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.sql.DriverManager;
import java.util.Properties;
import org.apache.derby.shared.common.error.StandardException;
+import org.apache.derby.shared.common.reference.Attribute;
import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.shared.common.reference.Property;
+import org.apache.derby.iapi.jdbc.InternalDriver;
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.iapi.services.property.PropertyUtil;
@@ -50,6 +53,27 @@ public class JDBCBoot {
bootProperties.put(name, value);
}
+ /*
+ ** Find the appropriate driver for our JDBC level and boot it.
+ * This is package protected so that AutoloadedDriver can call it.
+ */
+ public static void boot() {
+ PrintWriter pw = DriverManager.getLogWriter();
+
+ if (pw == null) {
+ pw = new PrintWriter(System.err, true);
+ }
+
+ try {
+ new JDBCBoot().boot(Attribute.PROTOCOL, pw);
+ }
+ catch (Throwable t)
+ {
+ t.printStackTrace( pw );
+ if ( t instanceof RuntimeException ) { throw (RuntimeException) t; }
+ }
+ }
+
/**
Boot a system requesting a JDBC driver but only if there is
no current JDBC driver that is handling the required protocol.
@@ -57,17 +81,25 @@ public class JDBCBoot {
*/
public void boot(String protocol, final PrintWriter logging) {
- if (org.apache.derby.jdbc.InternalDriver.activeDriver() == null)
- {
-
- // request that the InternalDriver (JDBC) service and the
- // authentication service be started.
- //
- addProperty("derby.service.jdbc", "org.apache.derby.jdbc.InternalDriver");
- addProperty("derby.service.authentication", AuthenticationService.MODULE);
-
- boot( bootProperties, logging);
- }
+ //
+ // Synchronization added as part of DERBY-6945. Further improvement
+ // on DERBY-4480. Moving the boot method out of EmbeddedDriver
+ // somehow created a race condition during simultaneous getConnection() calls.
+ //
+ synchronized(NETWORK_SERVER_AUTOSTART_CLASS_NAME)
+ {
+ if (InternalDriver.activeDriver() == null)
+ {
+
+ // request that the InternalDriver (JDBC) service and the
+ // authentication service be started.
+ //
+ addProperty("derby.service.jdbc", InternalDriver.class.getName());
+ addProperty("derby.service.authentication", AuthenticationService.MODULE);
+
+ boot( bootProperties, logging);
+ }
+ }
}
/**
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/db/SlaveDatabase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/db/SlaveDatabase.java?rev=1820615&r1=1820614&r2=1820615&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/db/SlaveDatabase.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/db/SlaveDatabase.java Tue Jan 9 02:03:24 2018
@@ -33,7 +33,7 @@ import org.apache.derby.iapi.util.Interr
import org.apache.derby.iapi.store.replication.slave.SlaveFactory;
import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
-import org.apache.derby.jdbc.InternalDriver;
+import org.apache.derby.iapi.jdbc.InternalDriver;
import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ConnectionChild.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ConnectionChild.java?rev=1820615&r1=1820614&r2=1820615&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ConnectionChild.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ConnectionChild.java Tue Jan 9 02:03:24 2018
@@ -21,7 +21,7 @@
package org.apache.derby.impl.jdbc;
-import org.apache.derby.jdbc.InternalDriver;
+import org.apache.derby.iapi.jdbc.InternalDriver;
import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
import org.apache.derby.iapi.util.InterruptStatus;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java?rev=1820615&r1=1820614&r2=1820615&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java Tue Jan 9 02:03:24 2018
@@ -21,7 +21,7 @@
package org.apache.derby.impl.jdbc;
-import org.apache.derby.jdbc.InternalDriver;
+import org.apache.derby.iapi.jdbc.InternalDriver;
import org.apache.derby.shared.common.reference.Attribute;
import org.apache.derby.shared.common.reference.MessageId;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBStoredProcedure.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBStoredProcedure.java?rev=1820615&r1=1820614&r2=1820615&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBStoredProcedure.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBStoredProcedure.java Tue Jan 9 02:03:24 2018
@@ -28,7 +28,7 @@ import java.sql.SQLException;
import org.apache.derby.iapi.jdbc.EngineLOB;
import org.apache.derby.shared.common.reference.Limits;
import org.apache.derby.shared.common.reference.SQLState;
-import org.apache.derby.jdbc.InternalDriver;
+import org.apache.derby.iapi.jdbc.InternalDriver;
/**
* Contains the stored procedures that will be used in the
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java?rev=1820615&r1=1820614&r2=1820615&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java Tue Jan 9 02:03:24 2018
@@ -21,7 +21,7 @@
package org.apache.derby.impl.jdbc;
-import org.apache.derby.jdbc.InternalDriver;
+import org.apache.derby.iapi.jdbc.InternalDriver;
import org.apache.derby.iapi.services.context.Context;
import org.apache.derby.iapi.services.context.ContextService;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NativeAuthenticationServiceImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NativeAuthenticationServiceImpl.java?rev=1820615&r1=1820614&r2=1820615&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NativeAuthenticationServiceImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NativeAuthenticationServiceImpl.java Tue Jan 9 02:03:24 2018
@@ -52,7 +52,7 @@ import org.apache.derby.iapi.store.acces
import org.apache.derby.iapi.util.IdUtil;
import org.apache.derby.iapi.util.StringUtil;
import org.apache.derby.impl.jdbc.Util;
-import org.apache.derby.jdbc.InternalDriver;
+import org.apache.derby.iapi.jdbc.InternalDriver;
/**
* <p>
Modified: 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/jdbc/AutoloadedDriver.java?rev=1820615&r1=1820614&r2=1820615&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java Tue Jan 9 02:03:24 2018
@@ -40,6 +40,8 @@ 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;
@@ -206,7 +208,7 @@ public class AutoloadedDriver implements
** Retrieve the driver which is specific to our JDBC level.
** We defer real work to this specific driver.
*/
- static Driver getDriverModule() throws SQLException {
+ public static Driver getDriverModule() throws SQLException {
if ( _engineForcedDown && (_autoloadedDriver == null))
{
@@ -214,7 +216,7 @@ public class AutoloadedDriver implements
throw Util.generateCsSQLException( SQLState.CORE_JDBC_DRIVER_UNREGISTERED );
}
- if ( !isBooted() ) { EmbeddedDriver.boot(); }
+ if ( !isBooted() ) { JDBCBoot.boot(); }
return _driverModule;
}
@@ -223,7 +225,7 @@ public class AutoloadedDriver implements
** Record which driver module actually booted.
* @param driver the driver register to DriverManager is not AutoloadedDriver
**/
- static void registerDriverModule( Driver driver )
+ public static void registerDriverModule( Driver driver )
{
_driverModule = driver;
_engineForcedDown = false;
@@ -245,7 +247,7 @@ public class AutoloadedDriver implements
* This happens when the engine is forcibly shut down.
*
**/
- static void unregisterDriverModule()
+ public static void unregisterDriverModule()
{
_engineForcedDown = true;
try {
Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java?rev=1820615&r1=1820614&r2=1820615&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java Tue Jan 9 02:03:24 2018
@@ -80,7 +80,7 @@ public class BasicEmbeddedConnectionPool
String password,
boolean requestPassword) throws SQLException {
- return findDriver().getNewPooledConnection(
- this, user, password, requestPassword);
+ findDriver();
+ return new EmbedPooledConnection(this, user, password, requestPassword);
}
}
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=1820615&r1=1820614&r2=1820615&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 Tue Jan 9 02:03:24 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.InternalDriver;
import org.apache.derby.impl.jdbc.Util;
/**
Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java?rev=1820615&r1=1820614&r2=1820615&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java Tue Jan 9 02:03:24 2018
@@ -111,8 +111,8 @@ public class BasicEmbeddedXADataSource40
boolean requestPassword) throws SQLException {
// See comment for EmbeddedXADataSource#createXAConnection
- return findDriver().getNewXAConnection(
- this, ra, user, password, requestPassword);
+ findDriver();
+ return new EmbedXAConnection(this, ra, user, password, requestPassword);
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver42.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver42.java?rev=1820615&r1=1820614&r2=1820615&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver42.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver42.java Tue Jan 9 02:03:24 2018
@@ -28,6 +28,7 @@ import java.sql.SQLException;
import org.apache.derby.iapi.jdbc.BrokeredConnection;
import org.apache.derby.iapi.jdbc.BrokeredConnectionControl;
import org.apache.derby.iapi.jdbc.BrokeredConnection42;
+import org.apache.derby.iapi.jdbc.InternalDriver;
import org.apache.derby.iapi.sql.ResultSet;
import org.apache.derby.impl.jdbc.EmbedPreparedStatement42;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java?rev=1820615&r1=1820614&r2=1820615&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java Tue Jan 9 02:03:24 2018
@@ -145,8 +145,8 @@ public class EmbeddedConnectionPoolDataS
* instantiating EmbeddedConnectionPoolDataSource) instead of
* the newer one (EmbeddedConnectionPoolDataSource40).
*/
- return findDriver().getNewPooledConnection(
- this, user, password, requestPassword);
+ findDriver();
+ return new EmbedPooledConnection(this, user, password, requestPassword);
}
}
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=1820615&r1=1820614&r2=1820615&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 Tue Jan 9 02:03:24 2018
@@ -91,14 +91,14 @@ import org.apache.derby.impl.jdbc.Util;
public class EmbeddedDriver implements Driver {
static {
- EmbeddedDriver.boot();
+ JDBCBoot.boot();
}
// Boot from the constructor as well to ensure that
// Class.forName(...).newInstance() reboots Derby
// after a shutdown inside the same JVM.
public EmbeddedDriver() {
- EmbeddedDriver.boot();
+ JDBCBoot.boot();
}
/*
@@ -183,28 +183,6 @@ public class EmbeddedDriver implements
return AutoloadedDriver.getDriverModule();
}
-
- /*
- ** Find the appropriate driver for our JDBC level and boot it.
- * This is package protected so that AutoloadedDriver can call it.
- */
- static void boot() {
- PrintWriter pw = DriverManager.getLogWriter();
-
- if (pw == null) {
- pw = new PrintWriter(System.err, true);
- }
-
- try {
- new JDBCBoot().boot(Attribute.PROTOCOL, pw);
- }
- catch (Throwable t)
- {
- t.printStackTrace( pw );
- if ( t instanceof RuntimeException ) { throw (RuntimeException) t; }
- }
- }
-
////////////////////////////////////////////////////////////////////
//
// INTRODUCED BY JDBC 4.1 IN JAVA 7
Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource.java?rev=1820615&r1=1820614&r2=1820615&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource.java Tue Jan 9 02:03:24 2018
@@ -178,8 +178,8 @@ public class EmbeddedXADataSource extend
* instantiating EmbeddedXADataSource) instead of the newer one
* (EmbeddedXADataSource40).
*/
- return findDriver().getNewXAConnection(
- this, ra, user, password, requestPassword);
+ findDriver();
+ return new EmbedXAConnection(this, ra, user, password, requestPassword);
}
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=1820615&r1=1820614&r2=1820615&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 Tue Jan 9 02:03:24 2018
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
import org.apache.derby.jdbc.AutoloadedDriver;
import org.apache.derby.jdbc.ClientDriver;
-import org.apache.derby.jdbc.InternalDriver;
+import org.apache.derby.iapi.jdbc.InternalDriver;
/**
* A wrapper around the methods added by JDBC 4.1.
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrentAutoloadTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrentAutoloadTest.java?rev=1820615&r1=1820614&r2=1820615&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrentAutoloadTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrentAutoloadTest.java Tue Jan 9 02:03:24 2018
@@ -66,7 +66,9 @@ public class ConcurrentAutoloadTest exte
public void run() {
try {
DriverManager.getConnection(url, user, pw);
+ println("Successfully connected!");
} catch (Throwable t) {
+ println("Failed to connect!");
errors.add(t);
}
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/RollBackWrappingWhenFailOnImportTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/RollBackWrappingWhenFailOnImportTest.java?rev=1820615&r1=1820614&r2=1820615&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/RollBackWrappingWhenFailOnImportTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/RollBackWrappingWhenFailOnImportTest.java Tue Jan 9 02:03:24 2018
@@ -25,7 +25,7 @@ import java.sql.SQLException;
import java.util.Properties;
import junit.framework.Test;
import org.apache.derby.impl.jdbc.EmbedConnection;
-import org.apache.derby.jdbc.InternalDriver;
+import org.apache.derby.iapi.jdbc.InternalDriver;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;