svn commit: r326289 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy

[dj...@apache.org]

Author: djd
Date: Tue Oct 18 15:58:08 2005
New Revision: 326289

URL: http://svn.apache.org/viewcvs?rev=326289&view=rev
Log:
DERBY-375 DERBY-613
Fix test failure for derbynet/getCurrentProperties.java

1. Removes the following permission from derbynet.jar and classes
directory. This is not required after the patch for DERBY-375.
permission java.io.FilePermission "${user.dir}${/}*", "write";

2. Grants the following permission to derbynet.jar. This is required
since tracing file location now defaults to ${derby.system.home}. The
test derbynet/getCurrentProperties.java uses this.
// tracing files default to derby.system.home,
derbynet/getCurrentProperties.java
permission java.io.FilePermission "${derby.system.home}${/}*", "write";

3. Grants the following permission to derbynet.jar and classes
directory. This is required by the test jdbcapi/secureUsers1.sql when
run using sane builds.
// sane=true, jdbcapi/secureUsers1.sql
permission java.io.FilePermission "${user.dir}${/}CloudLDAP.out", "write";

Contributed by Deepa Remesh dremesh@gmail.com

Modified:
    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/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=326289&r1=326288&r2=326289&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 Oct 18 15:58:08 2005
@@ -50,10 +50,8 @@
   permission java.net.SocketPermission "${csinfo.serverhost}", "accept";
   permission java.net.SocketPermission "${csinfo.trustedhost}", "accept";
     
-  // tracing files - BUG DERBY-613 default location for tracing
-  // file is meant to be ${derby.system.home} but instead is ${user.dir}
-  // Changes DERBY-613 may require modifying this permission.
-  permission java.io.FilePermission "${user.dir}${/}*", "write";  
+  // tracing files default to derby.system.home, derbynet/getCurrentProperties.java 
+  permission java.io.FilePermission "${derby.system.home}${/}*", "write";  
   
   // BUG DERBY-622 derbynet/sysinfo.java
   permission java.io.FilePermission "${csinfo.codedir}${/}*", "read";
@@ -65,6 +63,8 @@
   permission java.util.PropertyPermission "derby.monitor.verbose", "read";
   permission java.util.PropertyPermission "derby.debug.*", "read";
   
+  // sane=true, jdbcapi/secureUsers1.sql
+  permission java.io.FilePermission "${user.dir}${/}CloudLDAP.out", "write"; 
 };
 
 //
@@ -85,15 +85,13 @@
   permission java.net.SocketPermission "${csinfo.serverhost}", "accept";
   permission java.net.SocketPermission "${csinfo.trustedhost}", "accept";   
 
-  // tracing files - BUG DERBY-613 default location for tracing
-  // file is meant to be ${derby.system.home} but instead is ${user.dir}
-  // Changes DERBY-613 may require modifying this permission.
-  permission java.io.FilePermission "${user.dir}${/}*", "write"; 
-  
   // Import/export and other support files from these locations in tests
   permission java.io.FilePermission "${user.dir}${/}extin${/}*", "read";
   permission java.io.FilePermission "${user.dir}${/}extinout${/}*", "read, write";
   permission java.io.FilePermission "${user.dir}${/}extout${/}*", "write"; 
+  
+  // sane=true, jdbcapi/secureUsers1.sql
+  permission java.io.FilePermission "${user.dir}${/}CloudLDAP.out", "write"; 
 };