[
https://issues.apache.org/jira/browse/DERBY-6945?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Rick Hillegas updated DERBY-6945:
---------------------------------
Attachment: derby-6945-07-aa-net_client_overlap.diff
Attaching derby-6945-07-aa-net_client_overlap.diff. This patch moves
NaiveTrustManager out of derbynet.jar and derbyclient.jar and into
derbyshared.jar. I am running tests now.
There are other classes which substantially overlap across derbynet.jar and
derbyclient.jar. However, the versions are different enough that consolidating
them would be a non-trivial task. Therefore, I have not touched those classes.
They are:
CcsidManager.java
CodePoint.java
CodePointNameTable.java
DssConstants.java
EbcdicCcsidManager.java
FdocaConstants.java
SignedBinary.java
Utf8CcsidManager.java
Touches the following files:
-----------------------
A java/shared/org/apache/derby/shared/common/drda
A + java/shared/org/apache/derby/shared/common/drda/NaiveTrustManager.java
D java/client/org/apache/derby/client/net/NaiveTrustManager.java
D java/drda/org/apache/derby/impl/drda/NaiveTrustManager.java
Move NaiveTrustManager into the shared package space. The subversion merge
arrow goes from the drda version to the new shared version.
-----------------------
M java/client/org/apache/derby/client/net/OpenSocketAction.java
M java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
Adjust the callers of NaiveTrustManager accordingly.
> 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
> 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, 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
(v6.4.14#64029)
