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 19:03:32 UTC
svn commit: r1822475 - in /db/derby/code/trunk/java:
build/org/apache/derbyBuild/lastgoodjarcontents/
client/org/apache/derby/client/ client/org/apache/derby/jdbc/
testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/
Author: rhillegas
Date: Sun Jan 28 19:03:32 2018
New Revision: 1822475
URL: http://svn.apache.org/viewvc?rev=1822475&view=rev
Log:
DERBY-6945: Move unnecessary client classes out of the public api package and into packages internal to the client jar; commit derby-6945-15-aa-moveMoreClientClassesOutOfPublicAPI.diff.
Added:
db/derby/code/trunk/java/client/org/apache/derby/client/ClientConnectionPoolDataSourceInterface.java
- copied, changed from r1822464, db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSourceInterface.java
db/derby/code/trunk/java/client/org/apache/derby/client/ClientXADataSourceInterface.java
- copied, changed from r1822464, db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSourceInterface.java
Removed:
db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSourceInterface.java
db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSourceInterface.java
Modified:
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyclient.jar.lastcontents
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyclient.jar.lastcontents
db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java
db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java
db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java
db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClientConnectionPoolDataSourceTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyclient.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyclient.jar.lastcontents?rev=1822475&r1=1822474&r2=1822475&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyclient.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyclient.jar.lastcontents Sun Jan 28 19:03:32 2018
@@ -1,9 +1,11 @@
org.apache.derby.client.BasicClientDataSource.class
org.apache.derby.client.ClientAutoloadedDriver.class
+org.apache.derby.client.ClientConnectionPoolDataSourceInterface.class
org.apache.derby.client.ClientDataSourceFactory.class
org.apache.derby.client.ClientDataSourceInterface.class
org.apache.derby.client.ClientPooledConnection.class
org.apache.derby.client.ClientXAConnection.class
+org.apache.derby.client.ClientXADataSourceInterface.class
org.apache.derby.client.ClientXid.class
org.apache.derby.client.am.Agent.class
org.apache.derby.client.am.AsciiStream.class
@@ -144,11 +146,9 @@ org.apache.derby.jdbc.BasicClientDataSou
org.apache.derby.jdbc.BasicClientXADataSource40.class
org.apache.derby.jdbc.ClientConnectionPoolDataSource.class
org.apache.derby.jdbc.ClientConnectionPoolDataSource40.class
-org.apache.derby.jdbc.ClientConnectionPoolDataSourceInterface.class
org.apache.derby.jdbc.ClientDataSource.class
org.apache.derby.jdbc.ClientDataSource40.class
org.apache.derby.jdbc.ClientDriver.class
org.apache.derby.jdbc.ClientDriver40.class
org.apache.derby.jdbc.ClientXADataSource.class
org.apache.derby.jdbc.ClientXADataSource40.class
-org.apache.derby.jdbc.ClientXADataSourceInterface.class
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyclient.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyclient.jar.lastcontents?rev=1822475&r1=1822474&r2=1822475&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyclient.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyclient.jar.lastcontents Sun Jan 28 19:03:32 2018
@@ -1,9 +1,11 @@
org.apache.derby.client.BasicClientDataSource.class
org.apache.derby.client.ClientAutoloadedDriver.class
+org.apache.derby.client.ClientConnectionPoolDataSourceInterface.class
org.apache.derby.client.ClientDataSourceFactory.class
org.apache.derby.client.ClientDataSourceInterface.class
org.apache.derby.client.ClientPooledConnection.class
org.apache.derby.client.ClientXAConnection.class
+org.apache.derby.client.ClientXADataSourceInterface.class
org.apache.derby.client.ClientXid.class
org.apache.derby.client.am.Agent.class
org.apache.derby.client.am.AsciiStream.class
@@ -144,11 +146,9 @@ org.apache.derby.jdbc.BasicClientDataSou
org.apache.derby.jdbc.BasicClientXADataSource40.class
org.apache.derby.jdbc.ClientConnectionPoolDataSource.class
org.apache.derby.jdbc.ClientConnectionPoolDataSource40.class
-org.apache.derby.jdbc.ClientConnectionPoolDataSourceInterface.class
org.apache.derby.jdbc.ClientDataSource.class
org.apache.derby.jdbc.ClientDataSource40.class
org.apache.derby.jdbc.ClientDriver.class
org.apache.derby.jdbc.ClientDriver40.class
org.apache.derby.jdbc.ClientXADataSource.class
org.apache.derby.jdbc.ClientXADataSource40.class
-org.apache.derby.jdbc.ClientXADataSourceInterface.class
Copied: db/derby/code/trunk/java/client/org/apache/derby/client/ClientConnectionPoolDataSourceInterface.java (from r1822464, db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSourceInterface.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/ClientConnectionPoolDataSourceInterface.java?p2=db/derby/code/trunk/java/client/org/apache/derby/client/ClientConnectionPoolDataSourceInterface.java&p1=db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSourceInterface.java&r1=1822464&r2=1822475&rev=1822475&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSourceInterface.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/ClientConnectionPoolDataSourceInterface.java Sun Jan 28 19:03:32 2018
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.jdbc.ClientConnectionPoolDataSourceInterface
+ Derby - Class org.apache.derby.client.ClientConnectionPoolDataSourceInterface
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,12 +19,10 @@
*/
-package org.apache.derby.jdbc;
+package org.apache.derby.client;
import javax.sql.ConnectionPoolDataSource;
-import org.apache.derby.client.ClientDataSourceInterface;
-
/**
* Specifies Derby extensions to the {@code java.sqlx.ConnectionPoolDataSource}.
*/
Copied: db/derby/code/trunk/java/client/org/apache/derby/client/ClientXADataSourceInterface.java (from r1822464, db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSourceInterface.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/ClientXADataSourceInterface.java?p2=db/derby/code/trunk/java/client/org/apache/derby/client/ClientXADataSourceInterface.java&p1=db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSourceInterface.java&r1=1822464&r2=1822475&rev=1822475&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSourceInterface.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/ClientXADataSourceInterface.java Sun Jan 28 19:03:32 2018
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.jdbc.ClientXADataSourceInterface
+ Derby - Class org.apache.derby.client.ClientXADataSourceInterface
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,15 +19,13 @@
*/
-package org.apache.derby.jdbc;
+package org.apache.derby.client;
import java.sql.ShardingKeyBuilder;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
import javax.sql.XADataSource;
-import org.apache.derby.client.ClientDataSourceInterface;
-
/**
* Specifies Derby extensions to the {@code java.sqlx.XADataSource}.
*/
Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java?rev=1822475&r1=1822474&r2=1822475&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java Sun Jan 28 19:03:32 2018
@@ -28,6 +28,7 @@ import javax.sql.ConnectionPoolDataSourc
import javax.sql.PooledConnection;
import org.apache.derby.shared.common.i18n.MessageUtil;
import org.apache.derby.shared.common.reference.MessageId;
+import org.apache.derby.client.ClientConnectionPoolDataSourceInterface;
/**
* This data source is suitable for client/server use of Derby,
Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java?rev=1822475&r1=1822474&r2=1822475&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java Sun Jan 28 19:03:32 2018
@@ -27,6 +27,8 @@ import java.sql.SQLFeatureNotSupportedEx
import javax.sql.XAConnection;
import javax.sql.XADataSource;
+import org.apache.derby.client.ClientXADataSourceInterface;
+
/**
* This data source is suitable for client/server use of Derby,
* running on Java 8 Compact Profile 2 or higher.
Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java?rev=1822475&r1=1822474&r2=1822475&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java Sun Jan 28 19:03:32 2018
@@ -27,6 +27,7 @@ import java.sql.SQLException;
import javax.sql.PooledConnection;
import org.apache.derby.shared.common.i18n.MessageUtil;
import org.apache.derby.shared.common.reference.MessageId;
+import org.apache.derby.client.ClientConnectionPoolDataSourceInterface;
/**
* This datasource is suitable for a client/server use of Derby,
Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java?rev=1822475&r1=1822474&r2=1822475&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java Sun Jan 28 19:03:32 2018
@@ -27,6 +27,8 @@ import java.sql.SQLFeatureNotSupportedEx
import java.sql.SQLException;
import javax.sql.XAConnection;
+import org.apache.derby.client.ClientXADataSourceInterface;
+
/**
* <p>
* This datasource is suitable for a client/server use of Derby,
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClientConnectionPoolDataSourceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClientConnectionPoolDataSourceTest.java?rev=1822475&r1=1822474&r2=1822475&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClientConnectionPoolDataSourceTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClientConnectionPoolDataSourceTest.java Sun Jan 28 19:03:32 2018
@@ -30,7 +30,7 @@ import java.sql.Statement;
import javax.sql.PooledConnection;
import junit.framework.Test;
-import org.apache.derby.jdbc.ClientConnectionPoolDataSourceInterface;
+import org.apache.derby.client.ClientConnectionPoolDataSourceInterface;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
import org.apache.derbyTesting.junit.J2EEDataSource;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java?rev=1822475&r1=1822474&r2=1822475&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java Sun Jan 28 19:03:32 2018
@@ -53,8 +53,8 @@ import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
import junit.framework.Test;
import org.apache.derby.jdbc.BasicClientDataSource40;
-import org.apache.derby.jdbc.ClientConnectionPoolDataSourceInterface;
-import org.apache.derby.jdbc.ClientXADataSourceInterface;
+import org.apache.derby.client.ClientConnectionPoolDataSourceInterface;
+import org.apache.derby.client.ClientXADataSourceInterface;
import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
import org.apache.derbyTesting.functionTests.util.SecurityCheck;
import org.apache.derbyTesting.functionTests.util.TestRoutines;