river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peter_firmst...@apache.org
Subject svn commit: r822262 - in /incubator/river/jtsk/trunk/qa: build.xml jtreg/net/jini/activation/Activatable/downloadSecurityManager/security.policy jtreg/net/jini/activation/ActivationAdmin/getGroupsObjects/security.policy jtreg/testlibrary/TestLibrary.java
Date Tue, 06 Oct 2009 13:17:43 GMT
Author: peter_firmstone
Date: Tue Oct  6 13:17:42 2009
New Revision: 822262

URL: http://svn.apache.org/viewvc?rev=822262&view=rev
Log:
I'm in the process of removing the dependency on the test.props file so these options can
be passed in using the build script, jdk.home is defined in the build script.

Modified:
    incubator/river/jtsk/trunk/qa/build.xml
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/downloadSecurityManager/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/ActivationAdmin/getGroupsObjects/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/testlibrary/TestLibrary.java

Modified: incubator/river/jtsk/trunk/qa/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/build.xml?rev=822262&r1=822261&r2=822262&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/build.xml (original)
+++ incubator/river/jtsk/trunk/qa/build.xml Tue Oct  6 13:17:42 2009
@@ -159,7 +159,7 @@
             <arg value="-cpa:${jtlib.tmp}/jsk-policy.jar:${jtlib.tmp}/jsk-lib.jar:${jtlib.tmp}/jsk-platform.jar:${jtlib.tmp}/jsk-resources.jar:${jtlib.tmp}/phoenix-init.jar"/>
             <arg value="-Djsk.home=${river.home}"/>
             <arg value="-Djtlib.tmp=${jtlib.tmp}"/>
-            <arg value="-Djava.security.debug=access,failure"/>
+            <!--<arg value="-Djava.security.debug=access,failure"/>--> 
             <arg value="-Djavatest.maxOutputSize=500000"/>
             <!--<arg value="-Djsk.port=8081"/>-->
             <!--<arg value="net/jini/activation/Activatable/inactiveGroup" />-->

Modified: incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/downloadSecurityManager/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/downloadSecurityManager/security.policy?rev=822262&r1=822261&r2=822262&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/downloadSecurityManager/security.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/downloadSecurityManager/security.policy
Tue Oct  6 13:17:42 2009
@@ -12,7 +12,7 @@
 
 grant {
   permission java.io.FilePermission "<<ALL FILES>>", "read";
-
+  permission java.util.PropertyPermission "jsk.home", "read";   permission java.util.PropertyPermission
"jsk.port", "read"; permission java.util.PropertyPermission "jcov.options", "read";
   // need to move some classes out of the tests classpath; specific to this test
   permission java.io.FilePermission "${test.classes}", "read,write,delete";
   permission java.io.FilePermission "${test.classes}${/}-", "read,write,delete";

Modified: incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/ActivationAdmin/getGroupsObjects/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/ActivationAdmin/getGroupsObjects/security.policy?rev=822262&r1=822261&r2=822262&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/ActivationAdmin/getGroupsObjects/security.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/ActivationAdmin/getGroupsObjects/security.policy
Tue Oct  6 13:17:42 2009
@@ -12,9 +12,10 @@
 
 grant {
   // standard test activation permissions
-    permission java.util.PropertyPermission "jsk.home", "read";   permission java.util.PropertyPermission
"jsk.port", "read"; permission java.util.PropertyPermission "jcov.options", "read";
+  permission java.util.PropertyPermission "jsk.home", "read";   permission java.util.PropertyPermission
"jsk.port", "read"; permission java.util.PropertyPermission "jcov.options", "read";
+//  permission java.io.FilePermission "..${/}..${/}test.props", "read";
   permission java.io.FilePermission "${test.src}${/}..${/}..${/}..${/}..${/}..${/}..${/}..${/}..${/}TEST.ROOT",
"read";
-  permission java.io.FilePermission "${test.src}${/}..${/}..${/}..${/}..${/}..${/}..${/}..${/}..${/}..${/}build${/}test${/}test.props",
"read";
+//  permission java.io.FilePermission "${test.src}${/}..${/}..${/}..${/}..${/}..${/}..${/}..${/}..${/}..${/}build${/}test${/}test.props",
"read";
 
   // for HTTPD
   permission java.lang.RuntimePermission "createClassLoader";

Modified: incubator/river/jtsk/trunk/qa/jtreg/testlibrary/TestLibrary.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/testlibrary/TestLibrary.java?rev=822262&r1=822261&r2=822262&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/testlibrary/TestLibrary.java (original)
+++ incubator/river/jtsk/trunk/qa/jtreg/testlibrary/TestLibrary.java Tue Oct  6 13:17:42 2009
@@ -401,7 +401,7 @@
      * @param defaultVal
      * @return
      */
-    public static String getExtraProperty(String property, String defaultVal) {
+    public static String getExtraProperty(String property, String defaultVal) { 
 	/*Properties p = (Properties) AccessController.doPrivileged(
 	    new PrivilegedAction() {
 		public Object run() {



Mime
View raw message