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/04/01 17:35:40 UTC
svn commit: r1828145 - in /db/derby/code/trunk: ./
java/build/org/apache/derbyBuild/lastgoodjarcontents/ java/client/
java/drda/ java/engine/ java/optional/ java/run/ java/shared/
java/stubs/felix/ java/testing/org/apache/derbyTesting/functionTests/tes...
Author: rhillegas
Date: Sun Apr 1 17:35:39 2018
New Revision: 1828145
URL: http://svn.apache.org/viewvc?rev=1828145&view=rev
Log:
DERBY-6934: Add module descriptors to product jars; commit derby-6945-25-ab-moduleDescriptors.diff.
Added:
db/derby/code/trunk/java/client/module-info.java (with props)
db/derby/code/trunk/java/drda/module-info.java (with props)
db/derby/code/trunk/java/engine/module-info.java (with props)
db/derby/code/trunk/java/optional/module-info.java (with props)
db/derby/code/trunk/java/run/module-info.java (with props)
db/derby/code/trunk/java/shared/module-info.java (with props)
db/derby/code/trunk/java/stubs/felix/module-info.java (with props)
db/derby/code/trunk/java/tools/module-info.java (with props)
Modified:
db/derby/code/trunk/build.xml
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derby.jar.lastcontents
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyTesting.jar.lastcontents
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyclient.jar.lastcontents
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbynet.jar.lastcontents
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyoptionaltools.jar.lastcontents
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyrun.jar.lastcontents
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbytools.jar.lastcontents
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derby.jar.lastcontents
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyclient.jar.lastcontents
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbynet.jar.lastcontents
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyoptionaltools.jar.lastcontents
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyrun.jar.lastcontents
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbytools.jar.lastcontents
db/derby/code/trunk/java/client/build.xml
db/derby/code/trunk/java/drda/build.xml
db/derby/code/trunk/java/engine/build.xml
db/derby/code/trunk/java/optional/build.xml
db/derby/code/trunk/java/run/build.xml
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/VetJigsawTest.java
db/derby/code/trunk/java/tools/build.xml
Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1828145&r1=1828144&r2=1828145&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Sun Apr 1 17:35:39 2018
@@ -908,10 +908,11 @@
srcdir="${generated.src.engine.dir}"
destdir="${out.engine.dir}">
<include name="${derby.dir}/iapi/services/cache/ClassSizeCatalogImpl.java"/>
- <classpath>
+ <modulepath>
<pathelement location="${out.shared.dir}"/>
<pathelement location="${out.engine.dir}"/>
- </classpath>
+ <pathelement location="${osgi}"/>
+ </modulepath>
</javac>
</target>
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=1828145&r1=1828144&r2=1828145&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 Apr 1 17:35:39 2018
@@ -1,3 +1,4 @@
+module-info.class
org.apache.derby.agg.Aggregator.class
org.apache.derby.authentication.SystemPrincipal.class
org.apache.derby.authentication.UserAuthenticator.class
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyTesting.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyTesting.jar.lastcontents?rev=1828145&r1=1828144&r2=1828145&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyTesting.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyTesting.jar.lastcontents Sun Apr 1 17:35:39 2018
@@ -1,12 +1,14 @@
SimpleApp.class
-org.apache.derby.impl.tools.ij.SimpleCharStream.class
-org.apache.derby.impl.tools.ij.mtGrammar.class
-org.apache.derby.impl.tools.ij.mtGrammarConstants.class
-org.apache.derby.impl.tools.ij.mtGrammarTokenManager.class
-org.apache.derby.impl.tools.ij.mtTestCase.class
-org.apache.derby.impl.tools.ij.mtTestSuite.class
-org.apache.derby.impl.tools.ij.mtTester.class
-org.apache.derby.impl.tools.ij.mtTime.class
+WwdClientExample.class
+WwdEmbedded.class
+WwdUtils.class
+org.apache.derbyDemo.vtis.core.FlatFileVTI.class
+org.apache.derbyDemo.vtis.example.ApacheServerLogVTI.class
+org.apache.derbyDemo.vtis.example.DerbyJiraReportVTI.class
+org.apache.derbyDemo.vtis.example.LineListVTI.class
+org.apache.derbyDemo.vtis.example.PropertyFileVTI.class
+org.apache.derbyDemo.vtis.example.SubversionLogVTI.class
+toursdb.insertMaps.class
org.apache.derbyTesting.functionTests.harness.BackgroundStreamDrainer.class
org.apache.derbyTesting.functionTests.harness.BackgroundStreamSaver.class
org.apache.derbyTesting.functionTests.harness.CopySuppFiles.class
@@ -1035,4 +1037,3 @@ org.apache.derbyTesting.unitTests.store.
org.apache.derbyTesting.unitTests.store.commit_method.class
org.apache.derbyTesting.unitTests.util.BitUtil.class
org.apache.derbyTesting.unitTests.util.MsgTrace.class
-toursdb.insertMaps.class
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=1828145&r1=1828144&r2=1828145&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 Apr 1 17:35:39 2018
@@ -1,3 +1,4 @@
+module-info.class
org.apache.derby.client.BasicClientDataSource.class
org.apache.derby.client.ClientAutoloadedDriver.class
org.apache.derby.client.ClientConnectionPoolDataSourceInterface.class
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbynet.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbynet.jar.lastcontents?rev=1828145&r1=1828144&r2=1828145&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbynet.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbynet.jar.lastcontents Sun Apr 1 17:35:39 2018
@@ -1,3 +1,4 @@
+module-info.class
org.apache.derby.drda.NetServlet.class
org.apache.derby.drda.NetworkServerControl.class
org.apache.derby.impl.drda.AppRequester.class
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyoptionaltools.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyoptionaltools.jar.lastcontents?rev=1828145&r1=1828144&r2=1828145&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyoptionaltools.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyoptionaltools.jar.lastcontents Sun Apr 1 17:35:39 2018
@@ -1,3 +1,4 @@
+module-info.class
org.apache.derby.optional.api.LuceneIndexDescriptor.class
org.apache.derby.optional.api.LuceneUtils.class
org.apache.derby.optional.api.SimpleJsonUtils.class
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyrun.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyrun.jar.lastcontents?rev=1828145&r1=1828144&r2=1828145&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyrun.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyrun.jar.lastcontents Sun Apr 1 17:35:39 2018
@@ -1 +1,2 @@
+module-info.class
org.apache.derby.run.run.class
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbytools.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbytools.jar.lastcontents?rev=1828145&r1=1828144&r2=1828145&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbytools.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbytools.jar.lastcontents Sun Apr 1 17:35:39 2018
@@ -1,3 +1,4 @@
+module-info.class
org.apache.derby.iapi.tools.ToolUtils.class
org.apache.derby.iapi.tools.i18n.LocalizedInput.class
org.apache.derby.iapi.tools.i18n.LocalizedOutput.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=1828145&r1=1828144&r2=1828145&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 Apr 1 17:35:39 2018
@@ -1,3 +1,4 @@
+module-info.class
org.apache.derby.agg.Aggregator.class
org.apache.derby.authentication.SystemPrincipal.class
org.apache.derby.authentication.UserAuthenticator.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=1828145&r1=1828144&r2=1828145&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 Apr 1 17:35:39 2018
@@ -1,3 +1,4 @@
+module-info.class
org.apache.derby.client.BasicClientDataSource.class
org.apache.derby.client.ClientAutoloadedDriver.class
org.apache.derby.client.ClientConnectionPoolDataSourceInterface.class
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbynet.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbynet.jar.lastcontents?rev=1828145&r1=1828144&r2=1828145&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbynet.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbynet.jar.lastcontents Sun Apr 1 17:35:39 2018
@@ -1,3 +1,4 @@
+module-info.class
org.apache.derby.drda.NetServlet.class
org.apache.derby.drda.NetworkServerControl.class
org.apache.derby.impl.drda.AppRequester.class
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyoptionaltools.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyoptionaltools.jar.lastcontents?rev=1828145&r1=1828144&r2=1828145&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyoptionaltools.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyoptionaltools.jar.lastcontents Sun Apr 1 17:35:39 2018
@@ -1,3 +1,4 @@
+module-info.class
org.apache.derby.optional.api.LuceneIndexDescriptor.class
org.apache.derby.optional.api.LuceneUtils.class
org.apache.derby.optional.api.SimpleJsonUtils.class
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyrun.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyrun.jar.lastcontents?rev=1828145&r1=1828144&r2=1828145&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyrun.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyrun.jar.lastcontents Sun Apr 1 17:35:39 2018
@@ -1 +1,2 @@
+module-info.class
org.apache.derby.run.run.class
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbytools.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbytools.jar.lastcontents?rev=1828145&r1=1828144&r2=1828145&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbytools.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbytools.jar.lastcontents Sun Apr 1 17:35:39 2018
@@ -1,3 +1,4 @@
+module-info.class
org.apache.derby.iapi.tools.ToolUtils.class
org.apache.derby.iapi.tools.i18n.LocalizedInput.class
org.apache.derby.iapi.tools.i18n.LocalizedOutput.class
Modified: db/derby/code/trunk/java/client/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/build.xml?rev=1828145&r1=1828144&r2=1828145&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/build.xml (original)
+++ db/derby/code/trunk/java/client/build.xml Sun Apr 1 17:35:39 2018
@@ -62,9 +62,9 @@
srcdir="${derby.client.src.dir}"
destdir="${out.client.dir}">
<compilerarg value="-Xlint"/>
- <classpath>
+ <modulepath>
<pathelement location="${out.shared.dir}"/>
- </classpath>
+ </modulepath>
</javac>
</target>
Added: db/derby/code/trunk/java/client/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/module-info.java?rev=1828145&view=auto
==============================================================================
--- db/derby/code/trunk/java/client/module-info.java (added)
+++ db/derby/code/trunk/java/client/module-info.java Sun Apr 1 17:35:39 2018
@@ -0,0 +1,38 @@
+module org.apache.derby.client
+{
+ //
+ // MANDATORY IMPORTS
+ //
+ // REQUIRED AT COMPILE-TIME AND AT RUN-TIME.
+ //
+ requires java.base;
+ requires java.logging;
+ requires java.sql;
+
+ requires org.apache.derby.commons;
+
+ //
+ // OPTIONAL IMPORTS
+ //
+ // REQUIRED AT COMPILE-TIME.
+ // OPTIONAL AT RUN-TIME.
+ //
+ requires static java.naming;
+
+ //
+ // DERBY INTERNAL EXPORTS
+ //
+ // ONLY VISIBLE TO OTHER DERBY MODULES.
+ //
+ exports org.apache.derby.client to
+ org.apache.derby.tools;
+
+ exports org.apache.derby.client.am to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.client.am.stmtcache to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.client.net to
+ org.apache.derby.tests;
+}
Propchange: db/derby/code/trunk/java/client/module-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/code/trunk/java/drda/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/build.xml?rev=1828145&r1=1828144&r2=1828145&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/build.xml (original)
+++ db/derby/code/trunk/java/drda/build.xml Sun Apr 1 17:35:39 2018
@@ -65,12 +65,12 @@
srcdir="${derby.drda.src.dir}"
destdir="${out.drda.dir}">
<compilerarg value="-Xlint:unchecked"/>
- <classpath>
+ <modulepath>
<pathelement location="${servlet24}"/>
<pathelement location="${out.engine.dir}"/>
<pathelement location="${out.shared.dir}"/>
<pathelement location="${out.tools.dir}"/>
- </classpath>
+ </modulepath>
</javac>
<copy
Added: db/derby/code/trunk/java/drda/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/module-info.java?rev=1828145&view=auto
==============================================================================
--- db/derby/code/trunk/java/drda/module-info.java (added)
+++ db/derby/code/trunk/java/drda/module-info.java Sun Apr 1 17:35:39 2018
@@ -0,0 +1,34 @@
+module org.apache.derby.server
+{
+ //
+ // MANDATORY IMPORTS
+ //
+ requires java.base;
+ requires java.sql;
+
+ requires org.apache.derby.engine;
+ requires org.apache.derby.tools;
+ requires org.apache.derby.commons;
+
+ //
+ // OPTIONAL IMPORTS
+ //
+ // REQUIRED AT COMPILE-TIME.
+ // OPTIONAL AT RUN-TIME.
+ //
+
+ // NetServlet needs Java EE, which has not been modularized yet.
+ requires static geronimo.spec.servlet;
+
+ //
+ // DERBY INTERNAL EXPORTS
+ //
+ // ONLY VISIBLE TO OTHER DERBY MODULES.
+ //
+ exports org.apache.derby.drda to
+ org.apache.derby.runner,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.impl.drda to
+ org.apache.derby.tests;
+}
Propchange: db/derby/code/trunk/java/drda/module-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/code/trunk/java/engine/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/build.xml?rev=1828145&r1=1828144&r2=1828145&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/build.xml (original)
+++ db/derby/code/trunk/java/engine/build.xml Sun Apr 1 17:35:39 2018
@@ -66,10 +66,10 @@
srcdir="${derby.engine.src.dir}:${generated.src.engine.dir}"
destdir="${out.engine.dir}">
<compilerarg value="-Xlint:unchecked"/>
- <classpath>
+ <modulepath>
<pathelement location="${out.shared.dir}"/>
<pathelement location="${osgi}"/>
- </classpath>
+ </modulepath>
</javac>
<ant dir="${derby.build.src.dir}"/>
Added: db/derby/code/trunk/java/engine/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/module-info.java?rev=1828145&view=auto
==============================================================================
--- db/derby/code/trunk/java/engine/module-info.java (added)
+++ db/derby/code/trunk/java/engine/module-info.java Sun Apr 1 17:35:39 2018
@@ -0,0 +1,209 @@
+module org.apache.derby.engine
+{
+ //
+ // MANDADORY IMPORTS
+ //
+ // REQUIRED AT COMPILE-TIME AND AT RUN-TIME.
+ //
+ requires java.base;
+ requires java.logging;
+ requires java.management;
+ requires java.sql;
+ requires java.xml;
+
+ requires org.apache.derby.commons;
+
+ //
+ // OPTIONAL IMPORTS
+ //
+ // REQUIRED AT COMPILE-TIME.
+ // OPTIONAL AT RUN-TIME.
+ //
+ requires static java.naming;
+
+ requires static org.osgi.framework;
+
+ //
+ // DERBY PUBLIC API
+ //
+ // VISIBLE TO ALL CLASSES AT RUNTIME.
+ //
+ exports org.apache.derby.agg;
+ exports org.apache.derby.authentication;
+ exports org.apache.derby.catalog;
+ exports org.apache.derby.vti;
+
+ //
+ // DERBY INTERNAL EXPORTS
+ //
+ // VISIBLE ONLY INSIDE derby.jar AT RUNTIME.
+ //
+ exports org.apache.derby.catalog.types to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.database to
+ org.apache.derby.optionaltools,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.db to
+ org.apache.derby.server,
+ org.apache.derby.tools,
+ org.apache.derby.optionaltools,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.jdbc to
+ org.apache.derby.server,
+ org.apache.derby.tools,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.services.cache to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.services.context to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.services.crypto to
+ org.apache.derby.optionaltools,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.services.daemon to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.services.diag to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.services.io to
+ org.apache.derby.server,
+ org.apache.derby.optionaltools,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.services.jmx to
+ org.apache.derby.server;
+
+ exports org.apache.derby.iapi.services.loader to
+ org.apache.derby.optionaltools,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.services.locks to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.services.monitor to
+ org.apache.derby.server,
+ org.apache.derby.tools,
+ org.apache.derby.optionaltools,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.services.property to
+ org.apache.derby.server,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.services.uuid to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.sql to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.sql.compile to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.sql.conn to
+ org.apache.derby.optionaltools,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.sql.depend to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.sql.dictionary to
+ org.apache.derby.tools,
+ org.apache.derby.optionaltools,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.sql.execute to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.store.access to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.store.access.conglomerate to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.store.access.xa to
+ org.apache.derby.server,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.store.raw to
+ org.apache.derby.optionaltools,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.store.raw.data to
+ org.apache.derby.optionaltools,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.store.raw.log to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.store.raw.xact to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.transaction to
+ org.apache.derby.server;
+
+ exports org.apache.derby.iapi.types to
+ org.apache.derby.optionaltools,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.iapi.util to
+ org.apache.derby.server,
+ org.apache.derby.tools,
+ org.apache.derby.optionaltools,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.impl.io.vfmem to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.impl.jdbc to
+ org.apache.derby.server,
+ org.apache.derby.tools,
+ org.apache.derby.optionaltools,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.impl.jdbc.authentication to
+ org.apache.derby.optionaltools;
+
+ exports org.apache.derby.impl.services.jce to
+ org.apache.derby.optionaltools,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.impl.sql to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.impl.sql.catalog to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.impl.store.access.btree to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.impl.store.access.btree.index to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.impl.store.access.conglomerate to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.impl.store.raw.data to
+ org.apache.derby.optionaltools,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.impl.store.raw.log to
+ org.apache.derby.tests;
+
+ exports org.apache.derby.io to
+ org.apache.derby.optionaltools,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.mbeans to
+ org.apache.derby.server;
+
+ exports org.apache.derby.security to
+ org.apache.derby.tests;
+
+}
Propchange: db/derby/code/trunk/java/engine/module-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/code/trunk/java/optional/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/optional/build.xml?rev=1828145&r1=1828144&r2=1828145&view=diff
==============================================================================
--- db/derby/code/trunk/java/optional/build.xml (original)
+++ db/derby/code/trunk/java/optional/build.xml Sun Apr 1 17:35:39 2018
@@ -66,7 +66,7 @@
verbose="${verbose}"
srcdir="${derby.optional.src.dir}:${generated.src.dir}"
destdir="${out.optional.dir}">
- <classpath>
+ <modulepath>
<pathelement path="${out.shared.dir}"/>
<pathelement path="${out.engine.dir}"/>
<pathelement path="${out.tools.dir}"/>
@@ -74,7 +74,7 @@
<pathelement path="${lucene_a_co}"/>
<pathelement path="${lucene_qp}"/>
<pathelement path="${json_simple}"/>
- </classpath>
+ </modulepath>
<include name="${derby.dir}/${cur.dir}/**"/>
<compilerarg value="-Xlint:unchecked"/>
<compilerarg value="-Xlint:deprecation"/>
Added: db/derby/code/trunk/java/optional/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/optional/module-info.java?rev=1828145&view=auto
==============================================================================
--- db/derby/code/trunk/java/optional/module-info.java (added)
+++ db/derby/code/trunk/java/optional/module-info.java Sun Apr 1 17:35:39 2018
@@ -0,0 +1,23 @@
+module org.apache.derby.optionaltools
+{
+ //
+ // MANDATORY IMPORTS
+ //
+ requires java.base;
+ requires java.sql;
+
+ requires org.apache.derby.engine;
+ requires org.apache.derby.tools;
+ requires org.apache.derby.commons;
+
+ //
+ // OPTIONAL IMPORTS
+ //
+ // REQUIRED AT COMPILE-TIME.
+ // OPTIONAL AT RUN-TIME.
+ //
+ requires static json.simple;
+ requires static lucene.analyzers.common;
+ requires static lucene.core;
+ requires static lucene.queryparser;
+}
Propchange: db/derby/code/trunk/java/optional/module-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/code/trunk/java/run/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/run/build.xml?rev=1828145&r1=1828144&r2=1828145&view=diff
==============================================================================
--- db/derby/code/trunk/java/run/build.xml (original)
+++ db/derby/code/trunk/java/run/build.xml Sun Apr 1 17:35:39 2018
@@ -69,10 +69,10 @@
<include name="${derby.dir}/${cur.dir}/**"/>
<compilerarg value="-Xlint:unchecked"/>
<compilerarg value="-Xlint:deprecation"/>
- <classpath>
+ <modulepath>
<pathelement location="${out.drda.dir}"/>
<pathelement location="${out.tools.dir}"/>
- </classpath>
+ </modulepath>
</javac>
</target>
Added: db/derby/code/trunk/java/run/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/run/module-info.java?rev=1828145&view=auto
==============================================================================
--- db/derby/code/trunk/java/run/module-info.java (added)
+++ db/derby/code/trunk/java/run/module-info.java Sun Apr 1 17:35:39 2018
@@ -0,0 +1,17 @@
+module org.apache.derby.runner
+{
+ //
+ // MANDATORY IMPORTS
+ //
+ requires java.base;
+
+ requires org.apache.derby.server;
+ requires org.apache.derby.tools;
+
+ //
+ // DERBY PUBLIC API
+ //
+ // VISIBLE TO ALL CLASSES AT RUNTIME.
+ //
+ exports org.apache.derby.run;
+}
Propchange: db/derby/code/trunk/java/run/module-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: db/derby/code/trunk/java/shared/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/module-info.java?rev=1828145&view=auto
==============================================================================
--- db/derby/code/trunk/java/shared/module-info.java (added)
+++ db/derby/code/trunk/java/shared/module-info.java Sun Apr 1 17:35:39 2018
@@ -0,0 +1,67 @@
+module org.apache.derby.commons
+{
+ //
+ // MANDATORY IMPORTS
+ //
+ requires java.base;
+ requires java.sql;
+
+ //
+ // DERBY INTERNAL EXPORTS
+ //
+ // ONLY VISIBLE TO OTHER DERBY MODULES.
+ //
+ exports org.apache.derby.shared.common.drda to
+ org.apache.derby.client,
+ org.apache.derby.server,
+ org.apache.derby.optionaltools;
+
+ exports org.apache.derby.shared.common.error to
+ org.apache.derby.engine,
+ org.apache.derby.client,
+ org.apache.derby.server,
+ org.apache.derby.tools,
+ org.apache.derby.optionaltools,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.shared.common.i18n to
+ org.apache.derby.engine,
+ org.apache.derby.client,
+ org.apache.derby.server,
+ org.apache.derby.tools,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.shared.common.info to
+ org.apache.derby.engine,
+ org.apache.derby.client,
+ org.apache.derby.server,
+ org.apache.derby.tools,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.shared.common.reference to
+ org.apache.derby.engine,
+ org.apache.derby.client,
+ org.apache.derby.server,
+ org.apache.derby.tools,
+ org.apache.derby.optionaltools,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.shared.common.sanity to
+ org.apache.derby.engine,
+ org.apache.derby.client,
+ org.apache.derby.server,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.shared.common.security to
+ org.apache.derby.engine,
+ org.apache.derby.server,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.shared.common.stream to
+ org.apache.derby.engine,
+ org.apache.derby.server,
+ org.apache.derby.tests;
+
+ exports org.apache.derby.shared.common.util to
+ org.apache.derby.engine;
+}
Propchange: db/derby/code/trunk/java/shared/module-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: db/derby/code/trunk/java/stubs/felix/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/stubs/felix/module-info.java?rev=1828145&view=auto
==============================================================================
--- db/derby/code/trunk/java/stubs/felix/module-info.java (added)
+++ db/derby/code/trunk/java/stubs/felix/module-info.java Sun Apr 1 17:35:39 2018
@@ -0,0 +1,6 @@
+module org.osgi.framework
+{
+ requires java.base;
+
+ exports org.osgi.framework;
+}
Propchange: db/derby/code/trunk/java/stubs/felix/module-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/VetJigsawTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/VetJigsawTest.java?rev=1828145&r1=1828144&r2=1828145&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/VetJigsawTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/VetJigsawTest.java Sun Apr 1 17:35:39 2018
@@ -182,7 +182,7 @@ public class VetJigsawTest extends BaseJ
"insert into zipClasses\n" +
" select directory, '" + fullJarFileName + "', name\n" +
" from table(zipFile('" + fullJarFileName + "')) t\n" +
- " where name like '%.class'"
+ " where name like '%.class' and name <> 'module-info.class'"
);
}
private String vetContents() throws Exception
Modified: db/derby/code/trunk/java/tools/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/build.xml?rev=1828145&r1=1828144&r2=1828145&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/build.xml (original)
+++ db/derby/code/trunk/java/tools/build.xml Sun Apr 1 17:35:39 2018
@@ -72,11 +72,11 @@
srcdir="${derby.tools.src.dir}:${generated.src.tools.dir}"
destdir="${out.tools.dir}">
<compilerarg value="-Xlint"/>
- <classpath>
+ <modulepath>
<pathelement location="${out.shared.dir}"/>
<pathelement location="${out.engine.dir}"/>
<pathelement location="${out.client.dir}"/>
- </classpath>
+ </modulepath>
</javac>
<copy todir="${loc.tools.dir}" flatten="true">
Added: db/derby/code/trunk/java/tools/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/module-info.java?rev=1828145&view=auto
==============================================================================
--- db/derby/code/trunk/java/tools/module-info.java (added)
+++ db/derby/code/trunk/java/tools/module-info.java Sun Apr 1 17:35:39 2018
@@ -0,0 +1,46 @@
+module org.apache.derby.tools
+{
+ //
+ // MANDATORY IMPORTS
+ //
+ requires java.base;
+ requires java.logging;
+ requires java.sql;
+ requires java.xml;
+
+ requires org.apache.derby.engine;
+ requires org.apache.derby.client;
+ requires org.apache.derby.commons;
+
+ //
+ // OPTIONAL IMPORTS
+ //
+ // REQUIRED AT COMPILE-TIME.
+ // OPTIONAL AT RUN-TIME.
+ //
+ requires static java.naming;
+
+ //
+ // DERBY PUBLIC API
+ //
+ // VISIBLE TO ALL CLASSES AT RUNTIME.
+ //
+ exports org.apache.derby.jdbc;
+
+ //
+ // DERBY INTERNAL EXPORTS
+ //
+ // ONLY VISIBLE TO OTHER DERBY MODULES.
+ //
+ exports org.apache.derby.iapi.tools.i18n to
+ org.apache.derby.server,
+ org.apache.derby.optionaltools,
+ org.apache.derby.runner;
+
+ exports org.apache.derby.impl.tools.sysinfo to
+ org.apache.derby.server;
+
+ exports org.apache.derby.tools to
+ org.apache.derby.optionaltools,
+ org.apache.derby.runner;
+}
Propchange: db/derby/code/trunk/java/tools/module-info.java
------------------------------------------------------------------------------
svn:eol-style = native