db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bpendle...@apache.org
Subject svn commit: r391387 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/DerbyNet/sysinfo.out master/DerbyNetClient/sysinfo.out master/sysinfo_withproperties.out util/derby_tests.policy
Date Tue, 04 Apr 2006 19:00:51 GMT
Author: bpendleton
Date: Tue Apr  4 12:00:50 2006
New Revision: 391387

URL: http://svn.apache.org/viewcvs?rev=391387&view=rev
Log:
DERBY-1152: Failures in sysinfo tests with different classpath settings

Depending on the way the classpath was set, the sysinfo_withproperties and
sysinfo tests were unreliable. The problem is that the underlying sysinfo
classes are present in your classpath in several possible ways: you might
be pointing directly at the classes directory, or you might be pointing to
one of: derby.jar, derbytools.jar, or derbynet.jar, all three of which have
the sysinfo classes in them. This means that there are four possible
sections of the derby_tests.policy file that might be in effect for the
sysinfo classes during a test run, and those four sections were inconsistent.

This change modifies the derby_tests.policy file so that, at least for the
classpath and locale file permissions that are used by sysinfo, the policy
file expresses a consistent set of permissions for each of the four code
sources. The change also updates the master files to reflect the chosen
permissions, which are to allow access to the classpath and the locale files.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/sysinfo.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/sysinfo.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/sysinfo_withproperties.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/sysinfo.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/sysinfo.out?rev=391387&r1=391386&r2=391387&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/sysinfo.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/sysinfo.out
Tue Apr  4 12:00:50 2006
@@ -12,7 +12,6 @@
 derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 ----- Derby Information --------
-Unable to analyze class path: access denied (java.util.PropertyPermission java.class.path
read)
 -----
 ----- Locale Information -----------------
 Current Locale :  [English/United States [en_US]]
@@ -40,7 +39,6 @@
 derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 ----- Derby Information --------
-Unable to analyze class path: access denied (java.util.PropertyPermission java.class.path
read)
 -----
 ----- Locale Information -----------------
 Current Locale :  [English/United States [en_US]]
@@ -69,7 +67,6 @@
 derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 ----- Derby Information --------
-Unable to analyze class path: access denied (java.util.PropertyPermission java.class.path
read)
 -----
 ----- Locale Information -----------------
 Current Locale :  [English/United States [en_US]]

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/sysinfo.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/sysinfo.out?rev=391387&r1=391386&r2=391387&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/sysinfo.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/sysinfo.out
Tue Apr  4 12:00:50 2006
@@ -12,7 +12,6 @@
 derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 ----- Derby Information --------
-Unable to analyze class path: access denied (java.util.PropertyPermission java.class.path
read)
 -----
 ----- Locale Information -----------------
 Current Locale :  [English/United States [en_US]]
@@ -40,7 +39,6 @@
 derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 ----- Derby Information --------
-Unable to analyze class path: access denied (java.util.PropertyPermission java.class.path
read)
 -----
 ----- Locale Information -----------------
 Current Locale :  [English/United States [en_US]]
@@ -69,7 +67,6 @@
 derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 ----- Derby Information --------
-Unable to analyze class path: access denied (java.util.PropertyPermission java.class.path
read)
 -----
 ----- Locale Information -----------------
 Current Locale :  [English/United States [en_US]]

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/sysinfo_withproperties.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/sysinfo_withproperties.out?rev=391387&r1=391386&r2=391387&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/sysinfo_withproperties.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/sysinfo_withproperties.out
Tue Apr  4 12:00:50 2006
@@ -13,7 +13,6 @@
 derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 ----- Derby Information --------
-Unable to analyze class path: access denied (java.util.PropertyPermission java.class.path
read)
 -----
 ----- Locale Information -----------------
 Current Locale :  [English/United States [en_US]]
@@ -42,7 +41,6 @@
 derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 ----- Derby Information --------
-Unable to analyze class path: access denied (java.util.PropertyPermission java.class.path
read)
 -----
 ----- Locale Information -----------------
 Current Locale :  [English/United States [en_US]]
@@ -72,7 +70,6 @@
 derby.drda.host=xxxFILTERED_HOSTNAMExxx
 derby.drda.traceAll=false
 ----- Derby Information --------
-Unable to analyze class path: access denied (java.util.PropertyPermission java.class.path
read)
 -----
 ----- Locale Information -----------------
 Current Locale :  [English/United States [en_US]]

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy?rev=391387&r1=391386&r2=391387&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy
Tue Apr  4 12:00:50 2006
@@ -24,6 +24,7 @@
 //
 grant codeBase "${derbyTesting.codejar}derby.jar" {
   permission java.util.PropertyPermission "derby.*", "read";
+  permission java.util.PropertyPermission "java.class.path", "read";//sysinfo
   
   // for unit tests
   permission java.util.PropertyPermission "derbyTesting.unittest.*", "read";
@@ -64,6 +65,7 @@
 // Permissions for the network server (derbynet.jar)
 //
 grant codeBase "${derbyTesting.codejar}derbynet.jar" {
+  permission java.util.PropertyPermission "java.class.path", "read";//sysinfo
   
   // accept is needed for the server accepting connections
   // connect is needed for ping command (which is in the server jar)
@@ -106,6 +108,9 @@
   // Access all properties using System.getProperties
   permission java.util.PropertyPermission "*", "read, write";
   
+  // BUG DERBY-622 derbynet/sysinfo.java
+  permission java.io.FilePermission "${derbyTesting.codedir}${/}*", "read";
+
   // Read all files under ${user.dir}
   permission java.io.FilePermission "${user.dir}${/}-", "read";
   



Mime
View raw message