[
https://issues.apache.org/jira/browse/DERBY-6945?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16326654#comment-16326654
]
Rick Hillegas commented on DERBY-6945:
--------------------------------------
Attaching derby-6945-12-ab-moveClientDataSourceInterface.diff. This patch makes
the following changes:
1) Moves ClientDataSourceInterface out of org.apache.derby.jdbc and into
org.apache.derby.client. Although implemented by all of our client-side
DataSources, this interface is not part of the public api.
2) Puts the guts of org.apache.derby.jdbc.BasicClientDataSource40 into a new
class, org.apache.derby.client.BasicClientDataSource and then have the first
class extend the second.
These changes help uncouple client-side code from the public api package. The
next step will be to put the guts of ClientDriver into a new class inside
derbyclient.jar which will be the autoloaded driver for the client.
I am running tests now.
Touches the following files:
{noformat}
---------------------------------------
M
java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derby.jar.lastcontents
M
java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyclient.jar.lastcontents
M
java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derby.jar.lastcontents
M
java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyclient.jar.lastcontents
M java/client/org/apache/derby/jdbc/BasicClientDataSource40.java
A java/client/org/apache/derby/client/BasicClientDataSource.java
Move the guts of the core client-side DataSource into a class which will be
inside derbyclient.jar after we move org.apache.derby.jdbc into derbytools.jar.
---------------------------------------
A + java/client/org/apache/derby/client/ClientDataSourceInterface.java
D java/client/org/apache/derby/jdbc/ClientDataSourceInterface.java
Move the common client DataSource behavior into a class which will remain in
derbyclient.jar.
---------------------------------------
M java/client/org/apache/derby/client/ClientPooledConnection.java
M java/client/org/apache/derby/client/ClientXAConnection.java
M java/client/org/apache/derby/client/am/ClientConnection.java
M java/client/org/apache/derby/client/am/ClientJDBCObjectFactory.java
M java/client/org/apache/derby/client/am/LogWriter.java
M java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java
M java/client/org/apache/derby/client/net/NetConnection.java
M java/client/org/apache/derby/client/net/NetXAConnection.java
M java/client/org/apache/derby/client/net/OpenSocketAction.java
M
java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSourceInterface.java
M java/client/org/apache/derby/jdbc/ClientDriver.java
M java/client/org/apache/derby/jdbc/ClientXADataSourceInterface.java
M
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java
M
java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java
M
java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_1Indexing.java
M
java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3.java
M
java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p3.java
M
java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p4.java
M
java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p6.java
M
java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_Encrypted_1.java
M
java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/SimplePerfTest.java
M
java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/SimplePerfTest_Verify.java
Adjust import statements accordingly.
{noformat}
> Re-package Derby as a collection of jigsaw modules
> --------------------------------------------------
>
> Key: DERBY-6945
> URL: https://issues.apache.org/jira/browse/DERBY-6945
> Project: Derby
> Issue Type: Improvement
> Affects Versions: 10.13.1.2
> Reporter: Rick Hillegas
> Priority: Major
> Attachments: derby-6945-01-aa-remove_derbyPreBuild_dep.diff,
> derby-6945-02-ab-newDerbySharedJar.diff,
> derby-6945-02-ac-newDerbySharedJar.diff, derby-6945-03-aa-partitionTest.diff,
> derby-6945-04-aa-moveRunClass.diff,
> derby-6945-05-aa-removeRedundant_Attribute_SQLState.diff,
> derby-6945-06-aa-removeOtherSharedDuplicates.diff,
> derby-6945-07-aa-net_client_overlap.diff,
> derby-6945-08-aa-move_shared_iapi_under_shared.diff,
> derby-6945-08-ab-move_shared_iapi_under_shared.diff,
> derby-6945-08-ad-move_shared_iapi_under_shared.diff,
> derby-6945-09-ab-moveInternalDriver.diff, derby-6945-10-aa-moveDriver42.diff,
> derby-6945-11-ab-moveAutoloadedDriver.diff,
> derby-6945-12-ab-moveClientDataSourceInterface.diff, jdeps.out.tar
>
>
> Once we commit to building with Java 9 (see DERBY-6856), we should consider
> re-packaging Derby as a set of jigsaw modules. This would result in a
> different set of release artifacts. This might be a good opportunity to
> address the Tomcat artifactory issues raised by issue DERBY-6944.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
