Author: kmarsden
Date: Fri Nov 9 16:02:52 2007
New Revision: 593696
URL: http://svn.apache.org/viewvc?rev=593696&view=rev
Log:
DERBY-3183 Error starting tracing' in testTraceCommands(org.apache.derbyTesting.functionTests.tests.derbynet.NetworkServerControlApiTest)
on Windows...
Replace / with ${/} in test specific policy file.
DERBY-3174 NetworkServerControlApiTest fails with java.security.AccessControlException if
not run as first test
Change SecurityManager Setup to perform a policy refresh after changing the policy file so
that the new policy file gets loaded properly.
Merge revision 593676 from trunk
Modified:
db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java
db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.policy
db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java
db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.initial.policy
db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.modified.policy
db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.unreloadable.policy
db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy
db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java?rev=593696&r1=593695&r2=593696&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java
(original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java
Fri Nov 9 16:02:52 2007
@@ -32,8 +32,10 @@
import java.io.File;
import java.security.AccessController;
+import java.security.Policy;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
+import java.util.Enumeration;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -62,6 +64,7 @@
NetworkServerControl nsctrl = new NetworkServerControl();
String derbySystemHome = getSystemProperty("derby.system.home");
nsctrl.setTraceDirectory(derbySystemHome);
+
nsctrl.trace(true);
nsctrl.ping();
assertTrue(fileExists(derbySystemHome+"/Server3.trace"));
Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.policy
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.policy?rev=593696&r1=593695&r2=593696&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.policy
(original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.policy
Fri Nov 9 16:02:52 2007
@@ -94,7 +94,7 @@
permission java.net.SocketPermission "${derbyTesting.serverhost}", "accept,connect";
//tracing testing. NetworkServerControlApiTest
permission java.io.FilePermission "${derby.system.home}", "write";
- permission java.io.FilePermission "${derby.system.home}/-", "write";
+ permission java.io.FilePermission "${derby.system.home}${/}-", "write";
};
//
@@ -158,6 +158,7 @@
// the security manager and allow setIO to change the system err and out
// streams. Currently the nist suite runs with useprocess=false.
permission java.lang.RuntimePermission "setSecurityManager";
+ permission java.security.SecurityPermission "getPolicy";
permission java.lang.RuntimePermission "setIO";
};
Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java?rev=593696&r1=593695&r2=593696&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java
(original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java
Fri Nov 9 16:02:52 2007
@@ -45,9 +45,8 @@
public static Test suite() {
TestSuite suite = new TestSuite("derbynet");
-
- suite.addTest(NetworkServerControlApiTest.suite());
suite.addTest(PrepareStatementTest.suite());
+ suite.addTest(NetworkServerControlApiTest.suite());
suite.addTest(ShutDownDBWhenNSShutsDownTest.suite());
suite.addTest(DRDAProtocolTest.suite());
suite.addTest(ClientSideSystemPropertiesTest.suite());
Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.initial.policy
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.initial.policy?rev=593696&r1=593695&r2=593696&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.initial.policy
(original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.initial.policy
Fri Nov 9 16:02:52 2007
@@ -69,5 +69,6 @@
// the security manager and allow setIO to change the system err and out
// streams. Currently the nist suite runs with useprocess=false.
permission java.lang.RuntimePermission "setSecurityManager";
+ permission java.security.SecurityPermission "getPolicy";
permission java.lang.RuntimePermission "setIO";
};
Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.modified.policy
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.modified.policy?rev=593696&r1=593695&r2=593696&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.modified.policy
(original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.modified.policy
Fri Nov 9 16:02:52 2007
@@ -69,5 +69,6 @@
// the security manager and allow setIO to change the system err and out
// streams. Currently the nist suite runs with useprocess=false.
permission java.lang.RuntimePermission "setSecurityManager";
+ permission java.security.SecurityPermission "getPolicy";
permission java.lang.RuntimePermission "setIO";
};
Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.unreloadable.policy
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.unreloadable.policy?rev=593696&r1=593695&r2=593696&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.unreloadable.policy
(original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.unreloadable.policy
Fri Nov 9 16:02:52 2007
@@ -156,6 +156,7 @@
// the security manager and allow setIO to change the system err and out
// streams. Currently the nist suite runs with useprocess=false.
permission java.lang.RuntimePermission "setSecurityManager";
+ permission java.security.SecurityPermission "getPolicy";
permission java.lang.RuntimePermission "setIO";
};
@@ -194,6 +195,7 @@
// the security manager and allow setIO to change the system err and out
// streams. Currently the nist suite runs with useprocess=false.
permission java.lang.RuntimePermission "setSecurityManager";
+ permission java.security.SecurityPermission "getPolicy";
permission java.lang.RuntimePermission "setIO";
};
Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy?rev=593696&r1=593695&r2=593696&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy
(original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy
Fri Nov 9 16:02:52 2007
@@ -156,6 +156,7 @@
// the security manager and allow setIO to change the system err and out
// streams. Currently the nist suite runs with useprocess=false.
permission java.lang.RuntimePermission "setSecurityManager";
+ permission java.security.SecurityPermission "getPolicy";
permission java.lang.RuntimePermission "setIO";
};
Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java?rev=593696&r1=593695&r2=593696&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
(original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
Fri Nov 9 16:02:52 2007
@@ -177,9 +177,10 @@
public Object run() {
SecurityManager sm = new SecurityManager();
- System.setSecurityManager(sm);
- return null;
- }
+ System.setSecurityManager(sm);
+ Policy.getPolicy().refresh();
+ return null;
+ }
});
}
|