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/28 15:43:11 UTC
svn commit: r1822464 - in /db/derby/code/trunk/java:
build/org/apache/derbyBuild/lastgoodjarcontents/
drda/org/apache/derby/impl/drda/ engine/org/apache/derby/
engine/org/apache/derby/iapi/jdbc/ engine/org/apache/derby/impl/jdbc/
engine/org/apache/derb...
Author: rhillegas
Date: Sun Jan 28 15:43:11 2018
New Revision: 1822464
URL: http://svn.apache.org/viewvc?rev=1822464&view=rev
Log:
DERBY-6945: Move more engine classes out of the public api package and into engine-internal packages; commit derby-6945-14-aa-moveMoreEmbeddedClassesOutOfPublicAPI.diff.
Added:
db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EmbeddedConnectionPoolDataSourceInterface.java
- copied, changed from r1822241, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSourceInterface.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EmbeddedDataSourceInterface.java
- copied, changed from r1822241, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSourceInterface.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EmbeddedXADataSourceInterface.java
- copied, changed from r1822241, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSourceInterface.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPooledConnection.java
- copied, changed from r1822241, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedXAConnection.java
- copied, changed from r1822241, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAConnection.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedXAResource.java
- copied, changed from r1822241, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAResource.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ResourceAdapterImpl.java
- copied, changed from r1822241, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/ResourceAdapterImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/XAStatementControl.java
- copied, changed from r1822241, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/XAStatementControl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/XATransactionState.java
- copied, changed from r1822241, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/XATransactionState.java
Removed:
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAConnection.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAResource.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSourceInterface.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSourceInterface.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSourceInterface.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/ResourceAdapterImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/XAStatementControl.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/XATransactionState.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/XADatabase.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/EmbeddedConnectionPoolDataSource.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource.java
db/derby/code/trunk/java/engine/org/apache/derby/modules.properties
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=1822464&r1=1822463&r2=1822464&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 28 15:43:11 2018
@@ -65,6 +65,9 @@ org.apache.derby.iapi.jdbc.CharacterStre
org.apache.derby.iapi.jdbc.ConnectionContext.class
org.apache.derby.iapi.jdbc.DRDAServerStarter.class
org.apache.derby.iapi.jdbc.Driver42.class
+org.apache.derby.iapi.jdbc.EmbeddedConnectionPoolDataSourceInterface.class
+org.apache.derby.iapi.jdbc.EmbeddedDataSourceInterface.class
+org.apache.derby.iapi.jdbc.EmbeddedXADataSourceInterface.class
org.apache.derby.iapi.jdbc.EngineCallableStatement.class
org.apache.derby.iapi.jdbc.EngineConnection.class
org.apache.derby.iapi.jdbc.EngineLOB.class
@@ -515,6 +518,7 @@ org.apache.derby.impl.jdbc.EmbedConnecti
org.apache.derby.impl.jdbc.EmbedConnectionContext.class
org.apache.derby.impl.jdbc.EmbedDatabaseMetaData.class
org.apache.derby.impl.jdbc.EmbedParameterSetMetaData.class
+org.apache.derby.impl.jdbc.EmbedPooledConnection.class
org.apache.derby.impl.jdbc.EmbedPreparedStatement.class
org.apache.derby.impl.jdbc.EmbedPreparedStatement42.class
org.apache.derby.impl.jdbc.EmbedResultSet.class
@@ -522,6 +526,8 @@ org.apache.derby.impl.jdbc.EmbedResultSe
org.apache.derby.impl.jdbc.EmbedResultSetMetaData.class
org.apache.derby.impl.jdbc.EmbedSavepoint.class
org.apache.derby.impl.jdbc.EmbedStatement.class
+org.apache.derby.impl.jdbc.EmbedXAConnection.class
+org.apache.derby.impl.jdbc.EmbedXAResource.class
org.apache.derby.impl.jdbc.EncryptedLOBFile.class
org.apache.derby.impl.jdbc.InternalClob.class
org.apache.derby.impl.jdbc.LOBFile.class
@@ -531,6 +537,7 @@ org.apache.derby.impl.jdbc.LOBStoredProc
org.apache.derby.impl.jdbc.LOBStreamControl.class
org.apache.derby.impl.jdbc.PositionedStoreStream.class
org.apache.derby.impl.jdbc.ReaderToAscii.class
+org.apache.derby.impl.jdbc.ResourceAdapterImpl.class
org.apache.derby.impl.jdbc.SQLExceptionFactory.class
org.apache.derby.impl.jdbc.StoreStreamClob.class
org.apache.derby.impl.jdbc.TemporaryClob.class
@@ -539,6 +546,8 @@ org.apache.derby.impl.jdbc.UTF8Reader.cl
org.apache.derby.impl.jdbc.UpdatableBlobStream.class
org.apache.derby.impl.jdbc.Util.class
org.apache.derby.impl.jdbc.Util42.class
+org.apache.derby.impl.jdbc.XAStatementControl.class
+org.apache.derby.impl.jdbc.XATransactionState.class
org.apache.derby.impl.jdbc.authentication.AuthenticationServiceBase.class
org.apache.derby.impl.jdbc.authentication.BasicAuthenticationServiceImpl.class
org.apache.derby.impl.jdbc.authentication.JNDIAuthenticationSchemeBase.class
@@ -1350,23 +1359,14 @@ org.apache.derby.io.WritableStorageFacto
org.apache.derby.jdbc.BasicEmbeddedConnectionPoolDataSource40.class
org.apache.derby.jdbc.BasicEmbeddedDataSource40.class
org.apache.derby.jdbc.BasicEmbeddedXADataSource40.class
-org.apache.derby.jdbc.EmbedPooledConnection.class
-org.apache.derby.jdbc.EmbedXAConnection.class
-org.apache.derby.jdbc.EmbedXAResource.class
org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource.class
org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource40.class
-org.apache.derby.jdbc.EmbeddedConnectionPoolDataSourceInterface.class
org.apache.derby.jdbc.EmbeddedDataSource.class
org.apache.derby.jdbc.EmbeddedDataSource40.class
-org.apache.derby.jdbc.EmbeddedDataSourceInterface.class
org.apache.derby.jdbc.EmbeddedDriver.class
org.apache.derby.jdbc.EmbeddedXADataSource.class
org.apache.derby.jdbc.EmbeddedXADataSource40.class
-org.apache.derby.jdbc.EmbeddedXADataSourceInterface.class
org.apache.derby.jdbc.ReferenceableDataSource.class
-org.apache.derby.jdbc.ResourceAdapterImpl.class
-org.apache.derby.jdbc.XAStatementControl.class
-org.apache.derby.jdbc.XATransactionState.class
org.apache.derby.mbeans.CacheManagerMBean.class
org.apache.derby.mbeans.JDBCMBean.class
org.apache.derby.mbeans.Management.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=1822464&r1=1822463&r2=1822464&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 28 15:43:11 2018
@@ -65,6 +65,9 @@ org.apache.derby.iapi.jdbc.CharacterStre
org.apache.derby.iapi.jdbc.ConnectionContext.class
org.apache.derby.iapi.jdbc.DRDAServerStarter.class
org.apache.derby.iapi.jdbc.Driver42.class
+org.apache.derby.iapi.jdbc.EmbeddedConnectionPoolDataSourceInterface.class
+org.apache.derby.iapi.jdbc.EmbeddedDataSourceInterface.class
+org.apache.derby.iapi.jdbc.EmbeddedXADataSourceInterface.class
org.apache.derby.iapi.jdbc.EngineCallableStatement.class
org.apache.derby.iapi.jdbc.EngineConnection.class
org.apache.derby.iapi.jdbc.EngineLOB.class
@@ -516,6 +519,7 @@ org.apache.derby.impl.jdbc.EmbedConnecti
org.apache.derby.impl.jdbc.EmbedConnectionContext.class
org.apache.derby.impl.jdbc.EmbedDatabaseMetaData.class
org.apache.derby.impl.jdbc.EmbedParameterSetMetaData.class
+org.apache.derby.impl.jdbc.EmbedPooledConnection.class
org.apache.derby.impl.jdbc.EmbedPreparedStatement.class
org.apache.derby.impl.jdbc.EmbedPreparedStatement42.class
org.apache.derby.impl.jdbc.EmbedResultSet.class
@@ -523,6 +527,8 @@ org.apache.derby.impl.jdbc.EmbedResultSe
org.apache.derby.impl.jdbc.EmbedResultSetMetaData.class
org.apache.derby.impl.jdbc.EmbedSavepoint.class
org.apache.derby.impl.jdbc.EmbedStatement.class
+org.apache.derby.impl.jdbc.EmbedXAConnection.class
+org.apache.derby.impl.jdbc.EmbedXAResource.class
org.apache.derby.impl.jdbc.EncryptedLOBFile.class
org.apache.derby.impl.jdbc.InternalClob.class
org.apache.derby.impl.jdbc.LOBFile.class
@@ -532,6 +538,7 @@ org.apache.derby.impl.jdbc.LOBStoredProc
org.apache.derby.impl.jdbc.LOBStreamControl.class
org.apache.derby.impl.jdbc.PositionedStoreStream.class
org.apache.derby.impl.jdbc.ReaderToAscii.class
+org.apache.derby.impl.jdbc.ResourceAdapterImpl.class
org.apache.derby.impl.jdbc.SQLExceptionFactory.class
org.apache.derby.impl.jdbc.StoreStreamClob.class
org.apache.derby.impl.jdbc.TemporaryClob.class
@@ -540,6 +547,8 @@ org.apache.derby.impl.jdbc.UTF8Reader.cl
org.apache.derby.impl.jdbc.UpdatableBlobStream.class
org.apache.derby.impl.jdbc.Util.class
org.apache.derby.impl.jdbc.Util42.class
+org.apache.derby.impl.jdbc.XAStatementControl.class
+org.apache.derby.impl.jdbc.XATransactionState.class
org.apache.derby.impl.jdbc.authentication.AuthenticationServiceBase.class
org.apache.derby.impl.jdbc.authentication.BasicAuthenticationServiceImpl.class
org.apache.derby.impl.jdbc.authentication.JNDIAuthenticationSchemeBase.class
@@ -1353,23 +1362,14 @@ org.apache.derby.io.WritableStorageFacto
org.apache.derby.jdbc.BasicEmbeddedConnectionPoolDataSource40.class
org.apache.derby.jdbc.BasicEmbeddedDataSource40.class
org.apache.derby.jdbc.BasicEmbeddedXADataSource40.class
-org.apache.derby.jdbc.EmbedPooledConnection.class
-org.apache.derby.jdbc.EmbedXAConnection.class
-org.apache.derby.jdbc.EmbedXAResource.class
org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource.class
org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource40.class
-org.apache.derby.jdbc.EmbeddedConnectionPoolDataSourceInterface.class
org.apache.derby.jdbc.EmbeddedDataSource.class
org.apache.derby.jdbc.EmbeddedDataSource40.class
-org.apache.derby.jdbc.EmbeddedDataSourceInterface.class
org.apache.derby.jdbc.EmbeddedDriver.class
org.apache.derby.jdbc.EmbeddedXADataSource.class
org.apache.derby.jdbc.EmbeddedXADataSource40.class
-org.apache.derby.jdbc.EmbeddedXADataSourceInterface.class
org.apache.derby.jdbc.ReferenceableDataSource.class
-org.apache.derby.jdbc.ResourceAdapterImpl.class
-org.apache.derby.jdbc.XAStatementControl.class
-org.apache.derby.jdbc.XATransactionState.class
org.apache.derby.mbeans.CacheManagerMBean.class
org.apache.derby.mbeans.JDBCMBean.class
org.apache.derby.mbeans.Management.class
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java?rev=1822464&r1=1822463&r2=1822464&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java Sun Jan 28 15:43:11 2018
@@ -28,11 +28,10 @@ import javax.transaction.xa.XAResource;
import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.iapi.jdbc.EngineConnection;
import org.apache.derby.iapi.jdbc.ResourceAdapter;
+import org.apache.derby.iapi.jdbc.EmbeddedXADataSourceInterface;
import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.shared.common.i18n.MessageService;
import org.apache.derby.shared.common.info.JVMInfo;
-import org.apache.derby.jdbc.EmbeddedXADataSourceInterface;
-import org.apache.derby.jdbc.EmbeddedXADataSource;
/**
* This class contains database state specific to XA,
Copied: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EmbeddedConnectionPoolDataSourceInterface.java (from r1822241, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSourceInterface.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EmbeddedConnectionPoolDataSourceInterface.java?p2=db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EmbeddedConnectionPoolDataSourceInterface.java&p1=db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSourceInterface.java&r1=1822241&r2=1822464&rev=1822464&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSourceInterface.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EmbeddedConnectionPoolDataSourceInterface.java Sun Jan 28 15:43:11 2018
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.jdbc.EmbeddedConnectionPoolDataSourceInterface
+ Derby - Class org.apache.derby.iapi.jdbc.EmbeddedConnectionPoolDataSourceInterface
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;
/**
Copied: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EmbeddedDataSourceInterface.java (from r1822241, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSourceInterface.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EmbeddedDataSourceInterface.java?p2=db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EmbeddedDataSourceInterface.java&p1=db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSourceInterface.java&r1=1822241&r2=1822464&rev=1822464&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSourceInterface.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EmbeddedDataSourceInterface.java Sun Jan 28 15:43:11 2018
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.jdbc.EmbeddedDataSourceInterface
+ Derby - Class org.apache.derby.iapi.jdbc.EmbeddedDataSourceInterface
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,7 +19,10 @@
*/
-package org.apache.derby.jdbc;
+package org.apache.derby.iapi.jdbc;
+
+import java.sql.Connection;
+import java.sql.SQLException;
/**
* Methods that extend the API of
@@ -53,4 +56,19 @@ public interface EmbeddedDataSourceInter
public void setAttributesAsPassword(boolean attributesAsPassword);
public boolean getAttributesAsPassword();
+ /**
+ * Get a user connection.
+ *
+ * @param username the user name
+ * @param password the password
+ * @param requestPassword {@code true} if the password came from the
+ * getConnection() call with user and password arguments..
+ * @return user connection
+ * @throws SQLException
+ */
+ public Connection getConnection(String username,
+ String password,
+ boolean requestPassword)
+ throws SQLException;
+
}
Copied: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EmbeddedXADataSourceInterface.java (from r1822241, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSourceInterface.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EmbeddedXADataSourceInterface.java?p2=db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EmbeddedXADataSourceInterface.java&p1=db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSourceInterface.java&r1=1822241&r2=1822464&rev=1822464&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSourceInterface.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EmbeddedXADataSourceInterface.java Sun Jan 28 15:43:11 2018
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.jdbc.EmbeddedXADataSourceInterface
+ Derby - Class org.apache.derby.iapi.jdbc.EmbeddedXADataSourceInterface
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.ShardingKeyBuilder;
import java.sql.SQLException;
Copied: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPooledConnection.java (from r1822241, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPooledConnection.java?p2=db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPooledConnection.java&p1=db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java&r1=1822241&r2=1822464&rev=1822464&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPooledConnection.java Sun Jan 28 15:43:11 2018
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.jdbc.EmbedPooledConnection
+ Derby - Class org.apache.derby.impl.jdbc.EmbedPooledConnection
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.impl.jdbc;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.shared.common.reference.Property;
@@ -34,7 +34,7 @@ import org.apache.derby.iapi.jdbc.Broker
import org.apache.derby.iapi.jdbc.EngineConnection;
import org.apache.derby.impl.jdbc.EmbedPreparedStatement;
import org.apache.derby.impl.jdbc.EmbedCallableStatement;
-
+import org.apache.derby.iapi.jdbc.EmbeddedDataSourceInterface;
import java.sql.Connection;
import java.security.AccessController;
@@ -67,7 +67,7 @@ import javax.sql.StatementEventListener;
</UL>
*/
-class EmbedPooledConnection implements javax.sql.PooledConnection, BrokeredConnectionControl
+public class EmbedPooledConnection implements javax.sql.PooledConnection, BrokeredConnectionControl
{
/** the connection string */
private String connString;
@@ -102,7 +102,7 @@ class EmbedPooledConnection implements j
BrokeredConnection currentConnectionHandle;
// set up once by the data source
- final BasicEmbeddedDataSource40 dataSource;
+ final EmbeddedDataSourceInterface dataSource;
private final String username;
private final String password;
/**
@@ -120,7 +120,7 @@ class EmbedPooledConnection implements j
return isActive;
}
- EmbedPooledConnection(BasicEmbeddedDataSource40 ds, String u, String p,
+ public EmbedPooledConnection(EmbeddedDataSourceInterface ds, String u, String p,
boolean requestPassword) throws SQLException
{
dataSource = ds;
Copied: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedXAConnection.java (from r1822241, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAConnection.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedXAConnection.java?p2=db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedXAConnection.java&p1=db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAConnection.java&r1=1822241&r2=1822464&rev=1822464&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAConnection.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedXAConnection.java Sun Jan 28 15:43:11 2018
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.jdbc.EmbedXAConnection
+ Derby - Class org.apache.derby.impl.jdbc.EmbedXAConnection
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,10 +19,12 @@
*/
-package org.apache.derby.jdbc;
+package org.apache.derby.impl.jdbc;
import org.apache.derby.impl.jdbc.Util;
import org.apache.derby.iapi.jdbc.BrokeredConnectionControl;
+import org.apache.derby.iapi.jdbc.EmbeddedDataSourceInterface;
+import org.apache.derby.iapi.jdbc.EmbeddedXADataSourceInterface;
import org.apache.derby.iapi.jdbc.EngineConnection;
import org.apache.derby.iapi.jdbc.ResourceAdapter;
@@ -41,11 +43,11 @@ import javax.sql.XAConnection;
/**
*/
-class EmbedXAConnection extends EmbedPooledConnection implements XAConnection {
+public class EmbedXAConnection extends EmbedPooledConnection implements XAConnection {
private EmbedXAResource xaRes;
- EmbedXAConnection(BasicEmbeddedDataSource40 ds,
+ public EmbedXAConnection(EmbeddedDataSourceInterface ds,
ResourceAdapter ra,
String u,
String p,
Copied: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedXAResource.java (from r1822241, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAResource.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedXAResource.java?p2=db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedXAResource.java&p1=db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAResource.java&r1=1822241&r2=1822464&rev=1822464&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAResource.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedXAResource.java Sun Jan 28 15:43:11 2018
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.jdbc.EmbedXAResource
+ Derby - Class org.apache.derby.impl.jdbc.EmbedXAResource
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.impl.jdbc;
import java.security.PrivilegedExceptionAction;
import java.security.PrivilegedActionException;
Copied: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ResourceAdapterImpl.java (from r1822241, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/ResourceAdapterImpl.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ResourceAdapterImpl.java?p2=db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ResourceAdapterImpl.java&p1=db/derby/code/trunk/java/engine/org/apache/derby/jdbc/ResourceAdapterImpl.java&r1=1822241&r2=1822464&rev=1822464&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/ResourceAdapterImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ResourceAdapterImpl.java Sun Jan 28 15:43:11 2018
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.jdbc.ResourceAdapterImpl
+ Derby - Class org.apache.derby.impl.jdbc.ResourceAdapterImpl
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.impl.jdbc;
import org.apache.derby.shared.common.info.JVMInfo;
Copied: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/XAStatementControl.java (from r1822241, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/XAStatementControl.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/XAStatementControl.java?p2=db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/XAStatementControl.java&p1=db/derby/code/trunk/java/engine/org/apache/derby/jdbc/XAStatementControl.java&r1=1822241&r2=1822464&rev=1822464&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/XAStatementControl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/XAStatementControl.java Sun Jan 28 15:43:11 2018
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.jdbc.XAStatementControl
+ Derby - Class org.apache.derby.impl.jdbc.XAStatementControl
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.impl.jdbc;
import org.apache.derby.iapi.jdbc.BrokeredConnection;
import org.apache.derby.iapi.jdbc.BrokeredStatementControl;
Copied: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/XATransactionState.java (from r1822241, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/XATransactionState.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/XATransactionState.java?p2=db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/XATransactionState.java&p1=db/derby/code/trunk/java/engine/org/apache/derby/jdbc/XATransactionState.java&r1=1822241&r2=1822464&rev=1822464&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/XATransactionState.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/XATransactionState.java Sun Jan 28 15:43:11 2018
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.jdbc.XATransactionState
+ Derby - Class org.apache.derby.impl.jdbc.XATransactionState
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.impl.jdbc;
import java.security.AccessController;
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=1822464&r1=1822463&r2=1822464&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 Sun Jan 28 15:43:11 2018
@@ -23,6 +23,9 @@ package org.apache.derby.jdbc;
import java.sql.SQLException;
import javax.sql.PooledConnection;
+import org.apache.derby.iapi.jdbc.EmbeddedConnectionPoolDataSourceInterface;
+import org.apache.derby.impl.jdbc.EmbedPooledConnection;
+
/**
* This data source is suitable for an application using embedded Derby,
* running on Java 8 Compact Profile 2 or higher.
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=1822464&r1=1822463&r2=1822464&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 28 15:43:11 2018
@@ -43,6 +43,8 @@ import org.apache.derby.iapi.services.mo
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.iapi.jdbc.EmbeddedDataSourceInterface;
+import org.apache.derby.iapi.jdbc.EmbeddedXADataSourceInterface;
import org.apache.derby.impl.jdbc.Util;
/**
@@ -735,7 +737,7 @@ public class BasicEmbeddedDataSource40
* @return user connection
* @throws SQLException
*/
- final Connection getConnection(String username,
+ public final Connection getConnection(String username,
String password,
boolean requestPassword)
throws SQLException {
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=1822464&r1=1822463&r2=1822464&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 Sun Jan 28 15:43:11 2018
@@ -23,7 +23,9 @@ package org.apache.derby.jdbc;
import java.sql.SQLException;
import javax.sql.XAConnection;
+import org.apache.derby.iapi.jdbc.EmbeddedXADataSourceInterface;
import org.apache.derby.iapi.jdbc.ResourceAdapter;
+import org.apache.derby.impl.jdbc.EmbedXAConnection;
/**
*
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=1822464&r1=1822463&r2=1822464&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 Sun Jan 28 15:43:11 2018
@@ -24,6 +24,8 @@ package org.apache.derby.jdbc;
import java.sql.SQLException;
import javax.sql.PooledConnection;
+import org.apache.derby.iapi.jdbc.EmbeddedConnectionPoolDataSourceInterface;
+import org.apache.derby.impl.jdbc.EmbedPooledConnection;
/**
<P>
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=1822464&r1=1822463&r2=1822464&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 Sun Jan 28 15:43:11 2018
@@ -23,7 +23,9 @@ package org.apache.derby.jdbc;
import java.sql.SQLException;
import javax.sql.XAConnection;
+import org.apache.derby.iapi.jdbc.EmbeddedXADataSourceInterface;
import org.apache.derby.iapi.jdbc.ResourceAdapter;
+import org.apache.derby.impl.jdbc.EmbedXAConnection;
/**
Modified: db/derby/code/trunk/java/engine/org/apache/derby/modules.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/modules.properties?rev=1822464&r1=1822463&r2=1822464&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/modules.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/modules.properties Sun Jan 28 15:43:11 2018
@@ -171,7 +171,7 @@ cloudscape.config.jdbcJ8=derby
# resourceAdapter - requires JDK 1.2, JTA classes and JDBC20X classes
#
-derby.module.resourceAdapterJ2=org.apache.derby.jdbc.ResourceAdapterImpl
+derby.module.resourceAdapterJ2=org.apache.derby.impl.jdbc.ResourceAdapterImpl
derby.env.jdk.resourceAdapterJ2=2
derby.env.classes.resourceAdapterJ2=javax.transaction.xa.Xid,javax.transaction.xa.XAResource,javax.transaction.xa.XAException,javax.sql.DataSource,javax.sql.ConnectionPoolDataSource,javax.sql.PooledConnection,javax.sql.XAConnection,javax.sql.XADataSource
cloudscape.config.resourceAdapterJ2=derby