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/08/26 15:06:23 UTC
svn commit: r1839223 [2/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...
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/nwsvr.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/nwsvr.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/nwsvr.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/nwsvr.policy Sun Aug 26 15:06:22 2018
@@ -62,6 +62,7 @@ permission java.lang.RuntimePermission "
//
grant codeBase "${derbyTesting.shared}" {
permission java.util.PropertyPermission "jdk.module.path", "read";
+ permission java.io.FilePermission "${derby.install.path}${/}-", "read";
};
//Required set of permissions to stop the network server, assuming you have
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/useprocessfalse.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/useprocessfalse.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/useprocessfalse.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/useprocessfalse.policy Sun Aug 26 15:06:22 2018
@@ -31,5 +31,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/unitTests/junit/AssertFailureTest1.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/AssertFailureTest1.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/AssertFailureTest1.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/AssertFailureTest1.policy Sun Aug 26 15:06:22 2018
@@ -62,6 +62,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";
};
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest.policy Sun Aug 26 15:06:22 2018
@@ -168,6 +168,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/unitTests/junit/MissingPermissionsTest1.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest1.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest1.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest1.policy Sun Aug 26 15:06:22 2018
@@ -159,6 +159,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/unitTests/junit/MissingPermissionsTest2.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest2.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest2.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest2.policy Sun Aug 26 15:06:22 2018
@@ -142,6 +142,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";
};
// JUnit jar file tries to read junit.properties in the user's
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.policy Sun Aug 26 15:06:22 2018
@@ -135,6 +135,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/unitTests/junit/SystemPrivilegesPermissionTest1.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest1.policy?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest1.policy (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest1.policy Sun Aug 26 15:06:22 2018
@@ -115,6 +115,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.tools/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tools/module-info.java?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tools/module-info.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tools/module-info.java Sun Aug 26 15:06:22 2018
@@ -49,6 +49,12 @@ module org.apache.derby.tools
exports org.apache.derby.jdbc;
//
+ // SUPPORT MODULE LOOKUP
+ //
+ provides org.apache.derby.shared.api.DerbyModuleAPI
+ with org.apache.derby.info.tools.DerbyModule;
+
+ //
// ALLOW RESOURCE LOOKUP VIA REFLECTION
//
opens org.apache.derby.loc.tools;
Modified: db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java Sun Aug 26 15:06:22 2018
@@ -108,7 +108,7 @@ public final class LocalizedResource im
}
private void init (String encStr, String locStr, String msgF, boolean readEnv){
- if (encStr != null){
+ if (encStr != null){
encode = encStr;
}
//then get encoding string from environment
Modified: db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/impl/tools/sysinfo/Main.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/impl/tools/sysinfo/Main.java?rev=1839223&r1=1839222&r2=1839223&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/impl/tools/sysinfo/Main.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/impl/tools/sysinfo/Main.java Sun Aug 26 15:06:22 2018
@@ -469,8 +469,8 @@ public static void getMainInfo (java.io.
if (JVMInfo.isModuleAware())
{
- String moduleName = ModuleUtil.localizationModuleName(locale);
- Module localizationModule = ModuleUtil.jvmSystemModule(moduleName);
+ String moduleName = ModuleUtil.localizationModuleName(locale.toString());
+ Module localizationModule = ModuleUtil.derbyModule(moduleName);
if (localizationModule != null)
{
@@ -573,7 +573,7 @@ public static void getMainInfo (java.io.
if (JVMInfo.isModuleAware())
{
String moduleName = ModuleUtil.TESTING_MODULE_NAME;
- Module testingModule = ModuleUtil.jvmSystemModule(moduleName);
+ Module testingModule = ModuleUtil.derbyModule(moduleName);
if (testingModule != null)
{
@@ -605,7 +605,7 @@ public static void getMainInfo (java.io.
{
try
{
- Module testingModule = ModuleUtil.jvmSystemModule(ModuleUtil.TESTING_MODULE_NAME);
+ Module testingModule = ModuleUtil.derbyModule(ModuleUtil.TESTING_MODULE_NAME);
Class testingClass = testingModule.getClassLoader().loadClass(TEST_CLASS_NAME);
testJarURL = testingClass.getProtectionDomain().getCodeSource().getLocation();
}
Added: db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/info/tools/DerbyModule.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/info/tools/DerbyModule.java?rev=1839223&view=auto
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/info/tools/DerbyModule.java (added)
+++ db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/info/tools/DerbyModule.java Sun Aug 26 15:06:22 2018
@@ -0,0 +1,29 @@
+/*
+
+ Derby - Class org.apache.derby.info.tools.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.tools;
+
+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.tools/org/apache/derby/info/tools/DerbyModule.java
------------------------------------------------------------------------------
svn:eol-style = native