db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1839223 [1/2] - in /db/derby/code/trunk/java: build/org/apache/derbyBuild/lastgoodjarcontents/ locales/ org.apache.derby.client/ org.apache.derby.client/org/apache/derby/info/ org.apache.derby.client/org/apache/derby/info/client/ org.apach...
Date Sun, 26 Aug 2018 15:06:23 GMT
Author: rhillegas
Date: Sun Aug 26 15:06:22 2018
New Revision: 1839223

URL: http://svn.apache.org/viewvc?rev=1839223&view=rev
Log:
DERBY-6945: Make it possible to run the server with a module path, using the default security policy; commit derby-6945-48-ac-serverWithSecurityPolicy.diff.

Added:
    db/derby/code/trunk/java/locales/DerbyModule.template   (with props)
    db/derby/code/trunk/java/org.apache.derby.client/org/apache/derby/info/
    db/derby/code/trunk/java/org.apache.derby.client/org/apache/derby/info/client/
    db/derby/code/trunk/java/org.apache.derby.client/org/apache/derby/info/client/DerbyModule.java   (with props)
    db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/info/
    db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/info/shared/
    db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/info/shared/DerbyModule.java   (with props)
    db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/api/
    db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/api/DerbyModuleAPI.java   (with props)
    db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/info/
    db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/info/engine/
    db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/info/engine/DerbyModule.java   (with props)
    db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/info/
    db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/info/DerbyModule.java   (with props)
    db/derby/code/trunk/java/org.apache.derby.runner/org/apache/derby/run/info/
    db/derby/code/trunk/java/org.apache.derby.runner/org/apache/derby/run/info/DerbyModule.java   (with props)
    db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/info/
    db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/info/net/
    db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/info/net/DerbyModule.java   (with props)
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derby/info/
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derby/info/tsting/
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derby/info/tsting/DerbyModule.java   (with props)
    db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/info/
    db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/info/tools/
    db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/info/tools/DerbyModule.java   (with props)
Removed:
    db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/loc/client/
Modified:
    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.derbyTesting.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/locales/module-info.template
    db/derby/code/trunk/java/org.apache.derby.client/module-info.java
    db/derby/code/trunk/java/org.apache.derby.commons/module-info.java
    db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageService.java
    db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/ModuleUtil.java
    db/derby/code/trunk/java/org.apache.derby.engine/module-info.java
    db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/loc/build.xml
    db/derby/code/trunk/java/org.apache.derby.optionaltools/module-info.java
    db/derby/code/trunk/java/org.apache.derby.runner/build.xml
    db/derby/code/trunk/java/org.apache.derby.runner/module-info.java
    db/derby/code/trunk/java/org.apache.derby.server/module-info.java
    db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/server.policy
    db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/template.policy
    db/derby/code/trunk/java/org.apache.derby.tests/module-info.java
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ProtocolTest.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/RuntimeInfoTest.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/noDeregisterPermission.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/noAbortPermission.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LDAPTests.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.initial.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.modified.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.unreloadable.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/luceneSupport.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/no_derby_internals.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/resultSetReader.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/CacheManagerMBeanTest.withPerm.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/CacheManagerMBeanTest.withoutPerm.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/Derby5937SlaveShutdownTest.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/unit/fillLog.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/derby_tests.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/nwsvr.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/useprocessfalse.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/AssertFailureTest1.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest1.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest2.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.policy
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest1.policy
    db/derby/code/trunk/java/org.apache.derby.tools/module-info.java
    db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
    db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/impl/tools/sysinfo/Main.java

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=1839223&r1=1839222&r2=1839223&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 Aug 26 15:06:22 2018
@@ -1370,6 +1370,7 @@ org.apache.derby.impl.store.replication.
 org.apache.derby.impl.store.replication.net.SocketConnection.class
 org.apache.derby.impl.store.replication.slave.ReplicationLogScan.class
 org.apache.derby.impl.store.replication.slave.SlaveController.class
+org.apache.derby.info.engine.DerbyModule.class
 org.apache.derby.io.StorageFactory.class
 org.apache.derby.io.StorageFile.class
 org.apache.derby.io.StorageRandomAccessFile.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=1839223&r1=1839222&r2=1839223&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 Aug 26 15:06:22 2018
@@ -1,4 +1,5 @@
 module-info.class
+org.apache.derby.info.tsting.DerbyModule.class
 org.apache.derbyTesting.functionTests.harness.BackgroundStreamDrainer.class
 org.apache.derbyTesting.functionTests.harness.BackgroundStreamSaver.class
 org.apache.derbyTesting.functionTests.harness.CopySuppFiles.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=1839223&r1=1839222&r2=1839223&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 Aug 26 15:06:22 2018
@@ -142,3 +142,4 @@ org.apache.derby.client.net.StatementRep
 org.apache.derby.client.net.StatementRequestInterface.class
 org.apache.derby.client.net.Typdef.class
 org.apache.derby.client.net.Utf8CcsidManager.class
+org.apache.derby.info.client.DerbyModule.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=1839223&r1=1839222&r2=1839223&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 Aug 26 15:06:22 2018
@@ -42,4 +42,5 @@ org.apache.derby.impl.drda.StandardEXTDT
 org.apache.derby.impl.drda.Utf8CcsidManager.class
 org.apache.derby.impl.drda.XADatabase.class
 org.apache.derby.impl.drda.memCheck.class
+org.apache.derby.info.net.DerbyModule.class
 org.apache.derby.mbeans.drda.NetworkServerMBean.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=1839223&r1=1839222&r2=1839223&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 Aug 26 15:06:22 2018
@@ -5,6 +5,7 @@ org.apache.derby.optional.api.SimpleJson
 org.apache.derby.optional.api.SimpleJsonVTI.class
 org.apache.derby.optional.dump.DataFileVTI.class
 org.apache.derby.optional.dump.RawDBReader.class
+org.apache.derby.optional.info.DerbyModule.class
 org.apache.derby.optional.json.SimpleJsonTool.class
 org.apache.derby.optional.lucene.DerbyIndexInput.class
 org.apache.derby.optional.lucene.DerbyIndexOutput.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=1839223&r1=1839222&r2=1839223&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 Aug 26 15:06:22 2018
@@ -1,2 +1,3 @@
 module-info.class
+org.apache.derby.run.info.DerbyModule.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=1839223&r1=1839222&r2=1839223&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 Aug 26 15:06:22 2018
@@ -59,6 +59,7 @@ org.apache.derby.impl.tools.planexporter
 org.apache.derby.impl.tools.planexporter.TreeNode.class
 org.apache.derby.impl.tools.sysinfo.Main.class
 org.apache.derby.impl.tools.sysinfo.ZipInfoProperties.class
+org.apache.derby.info.tools.DerbyModule.class
 org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40.class
 org.apache.derby.jdbc.BasicClientDataSource40.class
 org.apache.derby.jdbc.BasicClientXADataSource40.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=1839223&r1=1839222&r2=1839223&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 Aug 26 15:06:22 2018
@@ -1370,6 +1370,7 @@ org.apache.derby.impl.store.replication.
 org.apache.derby.impl.store.replication.net.SocketConnection.class
 org.apache.derby.impl.store.replication.slave.ReplicationLogScan.class
 org.apache.derby.impl.store.replication.slave.SlaveController.class
+org.apache.derby.info.engine.DerbyModule.class
 org.apache.derby.io.StorageFactory.class
 org.apache.derby.io.StorageFile.class
 org.apache.derby.io.StorageRandomAccessFile.class

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyTesting.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyTesting.jar.lastcontents?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyTesting.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyTesting.jar.lastcontents Sun Aug 26 15:06:22 2018
@@ -1,4 +1,5 @@
 module-info.class
+org.apache.derby.info.tsting.DerbyModule.class
 org.apache.derbyTesting.functionTests.harness.BackgroundStreamDrainer.class
 org.apache.derbyTesting.functionTests.harness.BackgroundStreamSaver.class
 org.apache.derbyTesting.functionTests.harness.CopySuppFiles.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=1839223&r1=1839222&r2=1839223&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 Aug 26 15:06:22 2018
@@ -142,3 +142,4 @@ org.apache.derby.client.net.StatementRep
 org.apache.derby.client.net.StatementRequestInterface.class
 org.apache.derby.client.net.Typdef.class
 org.apache.derby.client.net.Utf8CcsidManager.class
+org.apache.derby.info.client.DerbyModule.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=1839223&r1=1839222&r2=1839223&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 Aug 26 15:06:22 2018
@@ -42,4 +42,5 @@ org.apache.derby.impl.drda.StandardEXTDT
 org.apache.derby.impl.drda.Utf8CcsidManager.class
 org.apache.derby.impl.drda.XADatabase.class
 org.apache.derby.impl.drda.memCheck.class
+org.apache.derby.info.net.DerbyModule.class
 org.apache.derby.mbeans.drda.NetworkServerMBean.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=1839223&r1=1839222&r2=1839223&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 Aug 26 15:06:22 2018
@@ -5,6 +5,7 @@ org.apache.derby.optional.api.SimpleJson
 org.apache.derby.optional.api.SimpleJsonVTI.class
 org.apache.derby.optional.dump.DataFileVTI.class
 org.apache.derby.optional.dump.RawDBReader.class
+org.apache.derby.optional.info.DerbyModule.class
 org.apache.derby.optional.json.SimpleJsonTool.class
 org.apache.derby.optional.lucene.DerbyIndexInput.class
 org.apache.derby.optional.lucene.DerbyIndexOutput.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=1839223&r1=1839222&r2=1839223&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 Aug 26 15:06:22 2018
@@ -1,2 +1,3 @@
 module-info.class
+org.apache.derby.run.info.DerbyModule.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=1839223&r1=1839222&r2=1839223&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 Aug 26 15:06:22 2018
@@ -59,6 +59,7 @@ org.apache.derby.impl.tools.planexporter
 org.apache.derby.impl.tools.planexporter.TreeNode.class
 org.apache.derby.impl.tools.sysinfo.Main.class
 org.apache.derby.impl.tools.sysinfo.ZipInfoProperties.class
+org.apache.derby.info.tools.DerbyModule.class
 org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40.class
 org.apache.derby.jdbc.BasicClientDataSource40.class
 org.apache.derby.jdbc.BasicClientXADataSource40.class

Added: db/derby/code/trunk/java/locales/DerbyModule.template
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/locales/DerbyModule.template?rev=1839223&view=auto
==============================================================================
--- db/derby/code/trunk/java/locales/DerbyModule.template (added)
+++ db/derby/code/trunk/java/locales/DerbyModule.template Sun Aug 26 15:06:22 2018
@@ -0,0 +1,29 @@
+/*
+
+   Derby - Class org.apache.derby.info.locale_@LOCALE@.DerbyModule
+
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+ */
+package org.apache.derby.info.locale_@LOCALE@;
+
+import org.apache.derby.shared.api.DerbyModuleAPI;
+
+/**
+ * Template for the vacuous provider class which lets
+ * the shared module find all Derby modules.
+ */
+public class DerbyModule implements DerbyModuleAPI {}

Propchange: db/derby/code/trunk/java/locales/DerbyModule.template
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/locales/module-info.template
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/locales/module-info.template?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/locales/module-info.template (original)
+++ db/derby/code/trunk/java/locales/module-info.template Sun Aug 26 15:06:22 2018
@@ -22,14 +22,30 @@
 /**
  * Template for the module descriptor generated
  * for each localization jar file. The localization
- * jars are declared "open" (for reflective use)
+ * packages are declared "open" (for reflective use)
  * so that the shared module can see their message files
  * when looking up message ids.
  */
 module org.apache.derby.locale_@LOCALE@
 {
+    //
+    // MANDATORY IMPORTS
+    //
+    requires java.base;
+
+    requires org.apache.derby.commons;
+
+    //
+    // PUBLIC API
+    //
     // Allow resource lookup via reflection
     opens org.apache.derby.info.locale_@LOCALE@;
     opens org.apache.derby.loc.locale_@LOCALE@;
     opens org.apache.derby.loc.tools.locale_@LOCALE@;
+
+    //
+    // SUPPORT MODULE LOOKUP
+    //
+    provides org.apache.derby.shared.api.DerbyModuleAPI
+        with org.apache.derby.info.locale_@LOCALE@.DerbyModule;
 }

Modified: db/derby/code/trunk/java/org.apache.derby.client/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.client/module-info.java?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.client/module-info.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.client/module-info.java Sun Aug 26 15:06:22 2018
@@ -41,6 +41,12 @@ module org.apache.derby.client
     requires static java.naming;
 
     //
+    // SUPPORT MODULE LOOKUP
+    //
+    provides org.apache.derby.shared.api.DerbyModuleAPI
+        with org.apache.derby.info.client.DerbyModule;
+
+    //
     // ALLOW RESOURCE LOOKUP VIA REFLECTION
     //
     opens org.apache.derby.loc.client;

Added: db/derby/code/trunk/java/org.apache.derby.client/org/apache/derby/info/client/DerbyModule.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.client/org/apache/derby/info/client/DerbyModule.java?rev=1839223&view=auto
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.client/org/apache/derby/info/client/DerbyModule.java (added)
+++ db/derby/code/trunk/java/org.apache.derby.client/org/apache/derby/info/client/DerbyModule.java Sun Aug 26 15:06:22 2018
@@ -0,0 +1,29 @@
+/*
+
+   Derby - Class org.apache.derby.info.client.DerbyModule
+
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+ */
+package org.apache.derby.info.client;
+
+import org.apache.derby.shared.api.DerbyModuleAPI;
+
+/**
+ * The vacuous provider class which lets
+ * the shared module find all Derby modules.
+ */
+public class DerbyModule implements DerbyModuleAPI {}

Propchange: db/derby/code/trunk/java/org.apache.derby.client/org/apache/derby/info/client/DerbyModule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/org.apache.derby.commons/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.commons/module-info.java?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.commons/module-info.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.commons/module-info.java Sun Aug 26 15:06:22 2018
@@ -30,9 +30,21 @@ module org.apache.derby.commons
     //
     // PUBLIC API
     //
+    exports org.apache.derby.shared.api;
     exports org.apache.derby.shared.common.security;
 
     //
+    // FOR FINDING ALL DERBY MODULES
+    //
+    uses org.apache.derby.shared.api.DerbyModuleAPI;
+    
+    //
+    // SUPPORT MODULE LOOKUP
+    //
+    provides org.apache.derby.shared.api.DerbyModuleAPI
+        with org.apache.derby.info.shared.DerbyModule;
+
+    //
     // DERBY INTERNAL EXPORTS
     //
     // ONLY VISIBLE TO OTHER DERBY MODULES.
@@ -42,13 +54,18 @@ module org.apache.derby.commons
         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;
+    // FIXME!
+    // EXPORTED TO UNNAMED MODULE SO THAT GENERATED
+    // CLASSES CAN ACCESS StandardException
+    //
+    exports org.apache.derby.shared.common.error;
+    //    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,

Added: db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/info/shared/DerbyModule.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/info/shared/DerbyModule.java?rev=1839223&view=auto
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/info/shared/DerbyModule.java (added)
+++ db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/info/shared/DerbyModule.java Sun Aug 26 15:06:22 2018
@@ -0,0 +1,29 @@
+/*
+
+   Derby - Class org.apache.derby.info.shared.DerbyModule
+
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+ */
+package org.apache.derby.info.shared;
+
+import org.apache.derby.shared.api.DerbyModuleAPI;
+
+/**
+ * The vacuous provider class which lets
+ * the shared module find all Derby modules.
+ */
+public class DerbyModule implements DerbyModuleAPI {}

Propchange: db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/info/shared/DerbyModule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/api/DerbyModuleAPI.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/api/DerbyModuleAPI.java?rev=1839223&view=auto
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/api/DerbyModuleAPI.java (added)
+++ db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/api/DerbyModuleAPI.java Sun Aug 26 15:06:22 2018
@@ -0,0 +1,28 @@
+/*
+
+   Derby - Class org.apache.derby.shared.api.DerbyModuleAPI
+
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package org.apache.derby.shared.api;
+
+/**
+ * This vacuous interface allows us to lookup the Derby modules
+ * via java.util.ServiceLoader.load().
+ **/
+public interface DerbyModuleAPI {}

Propchange: db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/api/DerbyModuleAPI.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageService.java?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageService.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageService.java Sun Aug 26 15:06:22 2018
@@ -27,6 +27,8 @@ import org.apache.derby.shared.common.re
 
 import java.io.InputStream;
 import java.io.IOException;
+import java.security.AccessController;
+import java.security.PrivilegedExceptionAction;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.PropertyResourceBundle;
@@ -50,6 +52,7 @@ public final class MessageService {
     private static final String CLIENT_MESSAGES = "clientmessages";
     private static final String TOOLS_MESSAGES = "toolsmessages";
     private static final String SYSINFO_MESSAGES = "sysinfoMessages";
+    private static final String SERVER_MESSAGES = "drda";
 
 	private static BundleFinder finder;
 
@@ -277,6 +280,7 @@ public final class MessageService {
         String moduleName;
         boolean useEnglish = locale.getLanguage().equals(EN.getLanguage());
         boolean useEngineModule = false;
+        boolean localizationModule = false;
 
         //
         // The message localizations should be in one of the following modules:
@@ -288,30 +292,71 @@ public final class MessageService {
         //
 
         if (resource.contains(CLIENT_MESSAGES)) { moduleName = ModuleUtil.CLIENT_MODULE_NAME; }
+        else if (resource.contains(SERVER_MESSAGES)) { moduleName = ModuleUtil.SERVER_MODULE_NAME; }
         else if (resource.contains(TOOLS_MESSAGES) || resource.contains(SYSINFO_MESSAGES))
         {
             if (useEnglish){ moduleName = ModuleUtil.TOOLS_MODULE_NAME; }
-            else { moduleName = ModuleUtil.localizationModuleName(locale); }
+            else
+            {
+                moduleName = ModuleUtil.localizationModuleName(locale.toString());
+                localizationModule = true;
+            }
         }
         else // must be engine messages
         {
-            if (useEnglish) { moduleName = ModuleUtil.ENGINE_MODULE_NAME; }
-            else { moduleName = ModuleUtil.localizationModuleName(locale); }
+            if (useEnglish)
+            {
+                moduleName = ModuleUtil.ENGINE_MODULE_NAME;
+                useEngineModule = true;
+            }
+            else
+            {
+                moduleName = ModuleUtil.localizationModuleName(locale.toString());
+                localizationModule = true;
+            }
+        }
 
-            useEngineModule = true;
+        Module messageModule = ModuleUtil.derbyModule(moduleName);
+        if (messageModule == null)
+        {
+            if (localizationModule)
+            {
+                // retry with just the language as the suffix of the localization module
+                moduleName = ModuleUtil.localizationModuleName(locale.getLanguage());
+                messageModule = ModuleUtil.derbyModule(moduleName);
+            }
+        }
+        if (messageModule == null)
+        {
+            return null;
+        }
+
+        // first try with whole locale string
+        ResourceBundle result = lookupBundleInModule
+          (messageModule, resource, locale.toString(), useEnglish, useEngineModule);
+
+        // if that fails, just use the language code without the country code
+        if ( result == null)
+        {
+            result = lookupBundleInModule
+              (messageModule, resource, locale.getLanguage(), useEnglish, useEngineModule);
         }
 
-        Module messageModule = ModuleUtil.jvmSystemModule(moduleName);
-        if (messageModule == null) { return null; }
+        return result;
+    }
 
+    /** Lookup a message in a given module */
+    private static ResourceBundle lookupBundleInModule
+      (Module messageModule, String resource, String localeSuffix, boolean useEnglish, boolean useEngineModule)
+    {
         StringBuilder buffer = new StringBuilder();
         buffer.append(resource.replace('.', '/'));
         if (!useEnglish)
         {
             buffer.append("_");
-            buffer.append(locale.toString());
+            buffer.append(localeSuffix);
         }
-        if (useEngineModule)
+        if (useEngineModule && useEnglish)
         {
             buffer.append("_en");
         }
@@ -330,12 +375,21 @@ public final class MessageService {
      * @return the corresponding resource bundle
      */
     private static PropertyResourceBundle getModuleResourceBundle
-       (String resourceName, Module module)
+       (final String resourceName, final Module module)
     {
         try
         {
-            InputStream is = module.getResourceAsStream(resourceName);
-            //System.out.println("XXX stream = " + is + " for resourceName " + resourceName + " in module " + module);
+            InputStream is = AccessController.doPrivileged
+                (
+                 new PrivilegedExceptionAction<InputStream>()
+                 {
+                    public InputStream run() throws IOException
+                    {
+                        return module.getResourceAsStream(resourceName);
+                    }
+                });
+
+            //System.out.println("        XXX stream = " + is + " for resourceName " + resourceName + " in module " + module);
 
             if (is != null)
             {
@@ -343,8 +397,9 @@ public final class MessageService {
             }
             else { return null; }
         }
-        catch (IOException ioe)
+        catch (Exception ioe)
         {
+            System.out.println(ioe.getMessage());
             return null;
         }
     }
@@ -357,7 +412,13 @@ public final class MessageService {
     */
     private static String localizeResourceName(String original, String localeName)
     {
-        if ((original == null) || (original.contains(CLIENT_MESSAGES))) { return original; }
+        if (
+            (original == null) ||
+            (original.contains(CLIENT_MESSAGES)) ||
+            (original.contains(SERVER_MESSAGES))
+            )
+        { return original; }
+
 
         // American English messages are not re-located to a subdirectory
         if (EN.toString().equals(localeName))

Modified: db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/ModuleUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/ModuleUtil.java?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/ModuleUtil.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/ModuleUtil.java Sun Aug 26 15:06:22 2018
@@ -21,17 +21,11 @@
 
 package org.apache.derby.shared.common.reference;
 
-import java.io.File;
-import java.lang.module.Configuration;
-import java.lang.module.ModuleFinder;
-import java.lang.module.ModuleReference;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.util.HashMap;
 import java.util.Locale;
-import java.util.Optional;
-import java.util.Set;
-import java.util.StringTokenizer;
+import java.util.ServiceLoader;
 
+import org.apache.derby.shared.api.DerbyModuleAPI;
 import org.apache.derby.shared.common.info.JVMInfo;
 
 /**
@@ -64,8 +58,8 @@ public class ModuleUtil
     //
     /////////////////////////////////////////////////////////
 
-    /** ModuleFinder for modules on the JVM's module path */
-    private static ModuleFinder _systemModuleFinder;
+    /** Map of module names to Derby modules */
+    private static HashMap<String,java.lang.Module> _derbyModules;
 
     /////////////////////////////////////////////////////////
     //
@@ -74,63 +68,32 @@ public class ModuleUtil
     /////////////////////////////////////////////////////////
 
     /**
-     * Return the module with the given name located on the system module path.
+     * Return the Derby module with the given name.
      *
      * @param moduleName The name of the module
      *
      * @return the corresponding module, or null if none is found
      */
-    public static java.lang.Module jvmSystemModule(String moduleName)
+    public static java.lang.Module derbyModule(String moduleName)
     {
         if (!JVMInfo.isModuleAware()) { return null; }
         
-        initModulePaths();  // read system module path
+        initModuleInfo();  // find all of the derby modules
 
-        try
-        {
-            ModuleLayer parent = ModuleLayer.boot();
-            Configuration configuration =
-                parent
-                .configuration()
-                .resolve(_systemModuleFinder, ModuleFinder.of(), Set.of(moduleName));
-            ModuleLayer layer =
-                parent.defineModulesWithOneLoader(configuration, ClassLoader.getSystemClassLoader());
-
-            return layer.findModule(moduleName).orElse(null);
-        }
-        catch (Exception ex)
-        {
-            return null;
-        }
-    }
-
-    /**
-     * Return all of the jigsaw modules on the system module path.
-     *
-     * @param name The name of the module
-     *
-     * @return the corresponding module, or null if none is found
-     */
-    public static Set<ModuleReference> allJvmSystemModules()
-    {
-        if (!JVMInfo.isModuleAware()) { return null; }
-
-        initModulePaths();  // read system module path
-
-        return _systemModuleFinder.findAll();
+        return _derbyModules.get(moduleName);
     }
 
     /**
      * Get the name of the module containing the localized
      * messages for the given locale.
      *
-     * @param locale The locale in question
+     * @param localeString The locale suffix to use
      *
      * @return the corresponding module name
      */
-    public static String localizationModuleName(Locale locale)
+    public static String localizationModuleName(String localeString)
     {
-        return LOCALE_MODULE_NAME_PREFIX + locale.toString();
+        return LOCALE_MODULE_NAME_PREFIX + localeString;
     }
 
     /////////////////////////////////////////////////////////
@@ -140,23 +103,24 @@ public class ModuleUtil
     /////////////////////////////////////////////////////////
 
     /**
-     * Initialize the list of module paths if necessary.
+     * Initialize the map of Derby modules.
      */
-    private static void initModulePaths()
+    private static void initModuleInfo()
     {
-        if (_systemModuleFinder != null) { return; }
+        if (_derbyModules != null) { return; }
 
-        String modulePathString = JVMInfo.getSystemModulePath();
-        StringTokenizer tokens = new StringTokenizer(modulePathString, File.pathSeparator);
-        int tokenCount = tokens.countTokens();
-        Path[] modulePaths = new Path[tokenCount];
+        HashMap<String,java.lang.Module> result = new HashMap<String,java.lang.Module>();
+        ServiceLoader<DerbyModuleAPI> loader = ServiceLoader.load(DerbyModuleAPI.class);
 
-        for (int idx = 0; idx < tokenCount; idx++)
+        for (DerbyModuleAPI provider : loader)
         {
-            modulePaths[idx] = Paths.get(tokens.nextToken());
+            Class providerClass = provider.getClass();
+            java.lang.Module providerModule = providerClass.getModule();
+
+            result.put(providerModule.getName(), providerModule);
         }
 
-        _systemModuleFinder = ModuleFinder.of(modulePaths);
+        _derbyModules = result;
     }
 
 }

Modified: db/derby/code/trunk/java/org.apache.derby.engine/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/module-info.java?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/module-info.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/module-info.java Sun Aug 26 15:06:22 2018
@@ -55,6 +55,12 @@ module org.apache.derby.engine
     exports org.apache.derby.vti;
 
     //
+    // SUPPORT MODULE LOOKUP
+    //
+    provides org.apache.derby.shared.api.DerbyModuleAPI
+        with org.apache.derby.info.engine.DerbyModule;
+
+    //
     // ALLOW RESOURCE LOOKUP VIA REFLECTION
     //
     
@@ -155,9 +161,12 @@ module org.apache.derby.engine
     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;
+    // FIXME! GENERATED CLASSES NEED TO ACCESS
+    // LanguageConnectionContext
+    exports org.apache.derby.iapi.sql.conn;
+    //    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;

Added: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/info/engine/DerbyModule.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/info/engine/DerbyModule.java?rev=1839223&view=auto
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/info/engine/DerbyModule.java (added)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/info/engine/DerbyModule.java Sun Aug 26 15:06:22 2018
@@ -0,0 +1,29 @@
+/*
+
+   Derby - Class org.apache.derby.info.engine.DerbyModule
+
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+ */
+package org.apache.derby.info.engine;
+
+import org.apache.derby.shared.api.DerbyModuleAPI;
+
+/**
+ * The vacuous provider class which lets
+ * the shared module find all Derby modules.
+ */
+public class DerbyModule implements DerbyModuleAPI {}

Propchange: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/info/engine/DerbyModule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/loc/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/loc/build.xml?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/loc/build.xml (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/loc/build.xml Sun Aug 26 15:06:22 2018
@@ -135,6 +135,10 @@
     <mkdir dir="${loc.client.dir}"/>
 
     <mkdir dir="${generated.src.dir}/${locale.stub}${localeSuffix}"/>
+    <mkdir dir="${generated.src.dir}/${locale.stub}${localeSuffix}/org/apache/derby/info/${locale.stub}${localeSuffix}"/>
+    <mkdir dir="${locale.output.dir}"/>
+    <mkdir dir="${locale.output.dir}/org/apache/derby/loc/${locale.stub}${localeSuffix}"/>
+
     <copy overwrite="true"
           file="${derby.locales.src.dir}/module-info.template"
           tofile="${generated.src.dir}/${locale.stub}${localeSuffix}/module-info.java">
@@ -143,8 +147,14 @@
       </filterset>
     </copy>
 
-    <mkdir dir="${locale.output.dir}"/>
-    <mkdir dir="${locale.output.dir}/org/apache/derby/loc/${locale.stub}${localeSuffix}"/>
+    <copy overwrite="true"
+          file="${derby.locales.src.dir}/DerbyModule.template"
+          tofile="${generated.src.dir}/${locale.stub}${localeSuffix}/org/apache/derby/info/${locale.stub}${localeSuffix}/DerbyModule.java">
+      <filterset>
+        <filter token="LOCALE" value="${localeSuffix}"/>
+      </filterset>
+    </copy>
+
   	<javac
       source="${min.version}"
       target="${min.version}"
@@ -158,6 +168,9 @@
       srcdir="${generated.src.dir}/${locale.stub}${localeSuffix}"
       destdir="${locale.output.dir}">
       <compilerarg value="-Xlint:unchecked"/>
+      <modulepath>
+		    <pathelement location="${out.shared.dir}"/>
+      </modulepath>
     </javac>
 
     <java classname="org.apache.derbyBuild.splitmessages"

Modified: db/derby/code/trunk/java/org.apache.derby.optionaltools/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.optionaltools/module-info.java?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.optionaltools/module-info.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.optionaltools/module-info.java Sun Aug 26 15:06:22 2018
@@ -49,4 +49,10 @@ module org.apache.derby.optionaltools
     //
     exports org.apache.derby.optional.api;
 
+    //
+    // SUPPORT MODULE LOOKUP
+    //
+    provides org.apache.derby.shared.api.DerbyModuleAPI
+        with org.apache.derby.optional.info.DerbyModule;
+
 }

Added: db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/info/DerbyModule.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/info/DerbyModule.java?rev=1839223&view=auto
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/info/DerbyModule.java (added)
+++ db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/info/DerbyModule.java Sun Aug 26 15:06:22 2018
@@ -0,0 +1,29 @@
+/*
+
+   Derby - Class org.apache.derby.optional.info.DerbyModule
+
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+ */
+package org.apache.derby.optional.info;
+
+import org.apache.derby.shared.api.DerbyModuleAPI;
+
+/**
+ * The vacuous provider class which lets
+ * the shared module find all Derby modules.
+ */
+public class DerbyModule implements DerbyModuleAPI {}

Propchange: db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/info/DerbyModule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/org.apache.derby.runner/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.runner/build.xml?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.runner/build.xml (original)
+++ db/derby/code/trunk/java/org.apache.derby.runner/build.xml Sun Aug 26 15:06:22 2018
@@ -70,6 +70,7 @@
       <compilerarg value="-Xlint:unchecked"/>
       <compilerarg value="-Xlint:deprecation"/>
       <modulepath>
+		    <pathelement location="${out.shared.dir}"/>
 		    <pathelement location="${out.drda.dir}"/>
 		    <pathelement location="${out.tools.dir}"/>
       </modulepath>

Modified: db/derby/code/trunk/java/org.apache.derby.runner/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.runner/module-info.java?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.runner/module-info.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.runner/module-info.java Sun Aug 26 15:06:22 2018
@@ -26,6 +26,7 @@ module org.apache.derby.runner
     //
     requires java.base;
 
+    requires org.apache.derby.commons;
     requires org.apache.derby.server;
     requires org.apache.derby.tools;
 
@@ -35,4 +36,11 @@ module org.apache.derby.runner
     // VISIBLE TO ALL CLASSES AT RUNTIME.
     //
     exports org.apache.derby.run;
+
+    //
+    // SUPPORT MODULE LOOKUP
+    //
+    provides org.apache.derby.shared.api.DerbyModuleAPI
+        with org.apache.derby.run.info.DerbyModule;
+
 }

Added: db/derby/code/trunk/java/org.apache.derby.runner/org/apache/derby/run/info/DerbyModule.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.runner/org/apache/derby/run/info/DerbyModule.java?rev=1839223&view=auto
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.runner/org/apache/derby/run/info/DerbyModule.java (added)
+++ db/derby/code/trunk/java/org.apache.derby.runner/org/apache/derby/run/info/DerbyModule.java Sun Aug 26 15:06:22 2018
@@ -0,0 +1,29 @@
+/*
+
+   Derby - Class org.apache.derby.run.info.DerbyModule
+
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+ */
+package org.apache.derby.run.info;
+
+import org.apache.derby.shared.api.DerbyModuleAPI;
+
+/**
+ * The vacuous provider class which lets
+ * the shared module find all Derby modules.
+ */
+public class DerbyModule implements DerbyModuleAPI {}

Propchange: db/derby/code/trunk/java/org.apache.derby.runner/org/apache/derby/run/info/DerbyModule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/org.apache.derby.server/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.server/module-info.java?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.server/module-info.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.server/module-info.java Sun Aug 26 15:06:22 2018
@@ -48,6 +48,23 @@ module org.apache.derby.server
     exports org.apache.derby.mbeans.drda;
 
     //
+    // SUPPORT MODULE LOOKUP
+    //
+    provides org.apache.derby.shared.api.DerbyModuleAPI
+        with org.apache.derby.info.net.DerbyModule;
+
+    //
+    // FIXME: We have to open this package to reflective access
+    // so that the server can read its default policy file.
+    //
+    opens org.apache.derby.drda;
+
+    //
+    // ALLOW REFLECTIVE ACCESS TO MESSAGE FILES
+    //
+    opens org.apache.derby.loc.drda;
+
+    //
     // DERBY INTERNAL EXPORTS
     //
     // ONLY VISIBLE TO OTHER DERBY MODULES.

Modified: db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/server.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/server.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/server.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/server.policy Sun Aug 26 15:06:22 2018
@@ -99,7 +99,13 @@ grant codeBase "${derby.install.url}derb
 // Permissions for shared code (derbyshared.jar)
 //
 grant codeBase "${derby.install.url}derbyshared.jar" {
+  // Needed to determine whether the JVM was booted with a module path.
   permission java.util.PropertyPermission "jdk.module.path", "read";
+
+  // Need in order to read message localizations from other derby jars
+  // when running with a module path.
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
+
 //
 // Permissions needed for JMX based management and monitoring, which is only
 // available for JVMs supporting "platform management", that is J2SE 5.0 or better.

Modified: db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/template.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/template.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/template.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/template.policy Sun Aug 26 15:06:22 2018
@@ -104,7 +104,13 @@ grant codeBase "${derby.install.url}derb
 // Permissions for shared code (derbyshared.jar)
 //
 grant codeBase "${derby.install.url}derbyshared.jar" {
+  // Needed to determine whether the JVM was booted with a module path.
   permission java.util.PropertyPermission "jdk.module.path", "read";
+
+  // Need in order to read message localizations from other derby jars
+  // when running with a module path.
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
+
 //
 // Permissions needed for JMX based management and monitoring, which is only
 // available for JVMs supporting "platform management", that is J2SE 5.0 or better.

Added: db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/info/net/DerbyModule.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/info/net/DerbyModule.java?rev=1839223&view=auto
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/info/net/DerbyModule.java (added)
+++ db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/info/net/DerbyModule.java Sun Aug 26 15:06:22 2018
@@ -0,0 +1,29 @@
+/*
+
+   Derby - Class org.apache.derby.info.net.DerbyModule
+
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+ */
+package org.apache.derby.info.net;
+
+import org.apache.derby.shared.api.DerbyModuleAPI;
+
+/**
+ * The vacuous provider class which lets
+ * the shared module find all Derby modules.
+ */
+public class DerbyModule implements DerbyModuleAPI {}

Propchange: db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/info/net/DerbyModule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/org.apache.derby.tests/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/module-info.java?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/module-info.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/module-info.java Sun Aug 26 15:06:22 2018
@@ -58,4 +58,10 @@ open module org.apache.derby.tests
     // NEEDED BY sysinfo
     exports org.apache.derbyTesting.junit;
 
+    //
+    // SUPPORT MODULE LOOKUP
+    //
+    provides org.apache.derby.shared.api.DerbyModuleAPI
+        with org.apache.derby.info.tsting.DerbyModule;
+
 }

Added: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derby/info/tsting/DerbyModule.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derby/info/tsting/DerbyModule.java?rev=1839223&view=auto
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derby/info/tsting/DerbyModule.java (added)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derby/info/tsting/DerbyModule.java Sun Aug 26 15:06:22 2018
@@ -0,0 +1,29 @@
+/*
+
+   Derby - Class org.apache.derby.info.tsting.DerbyModule
+
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+ */
+package org.apache.derby.info.tsting;
+
+import org.apache.derby.shared.api.DerbyModuleAPI;
+
+/**
+ * The vacuous provider class which lets
+ * the shared module find all Derby modules.
+ */
+public class DerbyModule implements DerbyModuleAPI {}

Propchange: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derby/info/tsting/DerbyModule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.policy Sun Aug 26 15:06:22 2018
@@ -126,6 +126,7 @@ grant codeBase "${derbyTesting.netserver
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
 };
 
 //

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.policy Sun Aug 26 15:06:22 2018
@@ -166,6 +166,7 @@ grant codeBase "${derbyTesting.tools}" {
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
 };
 
 //

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ProtocolTest.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ProtocolTest.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ProtocolTest.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ProtocolTest.policy Sun Aug 26 15:06:22 2018
@@ -41,5 +41,6 @@ grant codeBase "${derbyTesting.netserver
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
 };
 

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/RuntimeInfoTest.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/RuntimeInfoTest.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/RuntimeInfoTest.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/RuntimeInfoTest.policy Sun Aug 26 15:06:22 2018
@@ -138,6 +138,7 @@ permission java.util.PropertyPermission
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
 };
 
 //

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.policy Sun Aug 26 15:06:22 2018
@@ -242,6 +242,7 @@ grant codeBase "${derbyTesting.tools}" {
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
 };
 
 //

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.policy Sun Aug 26 15:06:22 2018
@@ -176,6 +176,7 @@ grant codeBase "${derbyTesting.tools}" {
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
 };
 
 //

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.policy Sun Aug 26 15:06:22 2018
@@ -211,6 +211,7 @@ grant codeBase "${derbyTesting.tools}" {
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
 };
 
 //

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/noDeregisterPermission.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/noDeregisterPermission.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/noDeregisterPermission.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/noDeregisterPermission.policy Sun Aug 26 15:06:22 2018
@@ -220,6 +220,7 @@ grant codeBase "${derbyTesting.tools}" {
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
 };
 
 //

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/noAbortPermission.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/noAbortPermission.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/noAbortPermission.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/noAbortPermission.policy Sun Aug 26 15:06:22 2018
@@ -199,7 +199,8 @@ grant codeBase "${derbyTesting.tools}" {
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
-};
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";}
+;
 
 //
 // Permissions for the tests (derbyTesting.jar)

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LDAPTests.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LDAPTests.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LDAPTests.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LDAPTests.policy Sun Aug 26 15:06:22 2018
@@ -191,6 +191,7 @@ grant codeBase "${derbyTesting.tools}" {
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
 };
 
 //

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.policy Sun Aug 26 15:06:22 2018
@@ -170,6 +170,7 @@ grant codeBase "${derbyTesting.tools}" {
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
 };
 
 //

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.initial.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.initial.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.initial.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.initial.policy Sun Aug 26 15:06:22 2018
@@ -119,6 +119,7 @@ grant {
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
 };
 
 grant codeBase "${derbyTesting.tools}" {

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.modified.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.modified.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.modified.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.modified.policy Sun Aug 26 15:06:22 2018
@@ -86,6 +86,7 @@ grant codeBase "${derbyTesting.testing}"
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
 };
 
 grant codeBase "${derbyTesting.tools}" {

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.unreloadable.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.unreloadable.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.unreloadable.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.unreloadable.policy Sun Aug 26 15:06:22 2018
@@ -138,6 +138,7 @@ permission java.util.PropertyPermission
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
 };
 
 //

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/luceneSupport.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/luceneSupport.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/luceneSupport.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/luceneSupport.policy Sun Aug 26 15:06:22 2018
@@ -345,6 +345,7 @@ grant {
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
 };
 
 // Grant the required permissions for JaCoCo (code coverage tool).

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/no_derby_internals.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/no_derby_internals.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/no_derby_internals.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/no_derby_internals.policy Sun Aug 26 15:06:22 2018
@@ -213,6 +213,7 @@ grant codeBase "${derbyTesting.client}"
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
 };
 
 //

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/resultSetReader.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/resultSetReader.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/resultSetReader.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/resultSetReader.policy Sun Aug 26 15:06:22 2018
@@ -224,6 +224,7 @@ grant codeBase "${derbyTesting.tools}" {
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
 };
 
 //

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/CacheManagerMBeanTest.withPerm.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/CacheManagerMBeanTest.withPerm.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/CacheManagerMBeanTest.withPerm.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/CacheManagerMBeanTest.withPerm.policy Sun Aug 26 15:06:22 2018
@@ -99,6 +99,7 @@ grant codeBase "${derbyTesting.antjunit}
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
 };
 
 grant codeBase "${derbyTesting.tools}" {

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/CacheManagerMBeanTest.withoutPerm.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/CacheManagerMBeanTest.withoutPerm.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/CacheManagerMBeanTest.withoutPerm.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/CacheManagerMBeanTest.withoutPerm.policy Sun Aug 26 15:06:22 2018
@@ -97,6 +97,7 @@ grant codeBase "${derbyTesting.antjunit}
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
 };
 
 grant codeBase "${derbyTesting.tools}" {

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/Derby5937SlaveShutdownTest.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/Derby5937SlaveShutdownTest.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/Derby5937SlaveShutdownTest.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/Derby5937SlaveShutdownTest.policy Sun Aug 26 15:06:22 2018
@@ -33,5 +33,6 @@ grant codeBase "${derbyTesting.engine}"
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
 };
 

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.policy Sun Aug 26 15:06:22 2018
@@ -24,5 +24,6 @@ grant codeBase "${derbyTesting.testing}"
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
 };
 

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/unit/fillLog.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/unit/fillLog.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/unit/fillLog.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/unit/fillLog.policy Sun Aug 26 15:06:22 2018
@@ -31,5 +31,6 @@ grant codeBase "${derbyTesting.engine}"
 //
 grant codeBase "${derbyTesting.shared}" {
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
 };
 

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/derby_tests.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/derby_tests.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/derby_tests.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/derby_tests.policy Sun Aug 26 15:06:22 2018
@@ -161,6 +161,7 @@ grant codeBase "${derbyTesting.shared}"
   // to create the trace files in that directory.
   permission java.util.PropertyPermission "user.dir", "read";
   permission java.util.PropertyPermission "jdk.module.path", "read";
+  permission java.io.FilePermission "${derby.install.path}${/}-", "read";
   permission java.io.FilePermission "${user.dir}${/}-", "read, write"; 
 
   //



Mime
View raw message