db-derby-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Rick Hillegas (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (DERBY-6945) Re-package Derby as a collection of jigsaw modules
Date Sun, 28 Jan 2018 22:30:00 GMT

    [ https://issues.apache.org/jira/browse/DERBY-6945?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16342758#comment-16342758
] 

Rick Hillegas commented on DERBY-6945:
--------------------------------------

Attaching derby-6945-16-aa-consolidatePublicAPI.diff. This patch consolidates the public api
in a directory under the tools branch of the source tree. This eliminates the separate org/apache/derby/jdbc
directories under the client and engine branches. The patch does NOT change the boundaries
of the jar files. That is, the engine classes in the org.apache.derby.jdbc package still live
in derby.jar and the client classes still live in derbyclient.jar. Tests passed cleanly for
me on this patch.

Touches the following files:

{noformat}
---------------------------------------

D       java/client/org/apache/derby/jdbc
D       java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java
D       java/client/org/apache/derby/jdbc/BasicClientDataSource40.java
D       java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java
D       java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java
D       java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java
D       java/client/org/apache/derby/jdbc/ClientDataSource.java
D       java/client/org/apache/derby/jdbc/ClientDataSource40.java
D       java/client/org/apache/derby/jdbc/ClientDriver.java
D       java/client/org/apache/derby/jdbc/ClientDriver40.java
D       java/client/org/apache/derby/jdbc/ClientXADataSource.java
D       java/client/org/apache/derby/jdbc/ClientXADataSource40.java
D       java/engine/org/apache/derby/jdbc
D       java/engine/org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java
D       java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java
D       java/engine/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java
D       java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
D       java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java
D       java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java
D       java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java
D       java/engine/org/apache/derby/jdbc/EmbeddedDriver.java
D       java/engine/org/apache/derby/jdbc/EmbeddedXADataSource.java
D       java/engine/org/apache/derby/jdbc/EmbeddedXADataSource40.java
D       java/engine/org/apache/derby/jdbc/ReferenceableDataSource.java
D       java/engine/org/apache/derby/jdbc/build.xml
D       java/engine/org/apache/derby/jdbc/package.html
A       java/tools/org/apache/derby/jdbc
A  +    java/tools/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java
A  +    java/tools/org/apache/derby/jdbc/BasicClientDataSource40.java
A  +    java/tools/org/apache/derby/jdbc/BasicClientXADataSource40.java
A  +    java/tools/org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java
A  +    java/tools/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java
A  +    java/tools/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java
A  +    java/tools/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java
A  +    java/tools/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java
A  +    java/tools/org/apache/derby/jdbc/ClientDataSource.java
A  +    java/tools/org/apache/derby/jdbc/ClientDataSource40.java
A  +    java/tools/org/apache/derby/jdbc/ClientDriver.java
A  +    java/tools/org/apache/derby/jdbc/ClientDriver40.java
A  +    java/tools/org/apache/derby/jdbc/ClientXADataSource.java
A  +    java/tools/org/apache/derby/jdbc/ClientXADataSource40.java
A  +    java/tools/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
A  +    java/tools/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java
A  +    java/tools/org/apache/derby/jdbc/EmbeddedDataSource.java
A  +    java/tools/org/apache/derby/jdbc/EmbeddedDataSource40.java
A  +    java/tools/org/apache/derby/jdbc/EmbeddedDriver.java
A  +    java/tools/org/apache/derby/jdbc/EmbeddedXADataSource.java
A  +    java/tools/org/apache/derby/jdbc/EmbeddedXADataSource40.java
A  +    java/tools/org/apache/derby/jdbc/ReferenceableDataSource.java
A  +    java/tools/org/apache/derby/jdbc/build.xml
A  +    java/tools/org/apache/derby/jdbc/package.html

Consolidate the two branches of org.apache.derby.jdbc under the tools branch.

---------------------------------------

M       build.xml
M       java/engine/build.xml
M       java/tools/build.xml

Adjust build scripts accordingly.

---------------------------------------

M       java/client/org/apache/derby/client/net/NetLogWriter.java

Break a dependency of this client class on the public api.

---------------------------------------

M       java/engine/org/apache/derby/osgi/EmbeddedActivator.java

Break a dependency of this engine class on the public api.
{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, derby-6945-13-aa-create-ClientAutoloadedDriver.diff,
derby-6945-14-aa-moveMoreEmbeddedClassesOutOfPublicAPI.diff, derby-6945-15-aa-moveMoreClientClassesOutOfPublicAPI.diff,
derby-6945-16-aa-consolidatePublicAPI.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)

Mime
View raw message