incubator-river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peter_firmst...@apache.org
Subject svn commit: r824055 - in /incubator/river/jtsk/trunk/qa: ./ jtreg/net/jini/activation/Activatable/activateExceptionTest/ jtreg/net/jini/activation/Activatable/activateFailure/ jtreg/net/jini/activation/Activatable/checkRegisterInLog/ jtreg/net/jini/act...
Date Sun, 11 Oct 2009 11:47:33 GMT
Author: peter_firmstone
Date: Sun Oct 11 11:47:32 2009
New Revision: 824055

URL: http://svn.apache.org/viewvc?rev=824055&view=rev
Log:
test.props file is now constructed from qa build script, some recent changes to policy files
granting access to system properties have been backed out.

Please test.

Modified:
    incubator/river/jtsk/trunk/qa/build.xml
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/activateExceptionTest/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/activateFailure/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/checkRegisterInLog/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/createPrivateActivable/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/downloadParameterClass/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/downloadSecurityManager/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/forceLogSnapshot/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/inactiveGroup/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/nestedActivate/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/nonExistentActivatable/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/restartCrashedService/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/restartService/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/terminateGroup/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/useProxyAccessor/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/ActivationAdmin/getGroupsObjects/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/ActivationSystem/ensureRestart/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/ActivationSystem/unregisterGroup/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/io/MarshalInputStream/verifyWithEqualLoaders/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/jrmp/echo/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/loader/ClassLoading/verifyBeforeLoading/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/checkBoomerangs/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/checkDefinite/security.policy
    incubator/river/jtsk/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/registryRetainCodebase/client.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=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/build.xml (original)
+++ incubator/river/jtsk/trunk/qa/build.xml Sun Oct 11 11:47:32 2009
@@ -145,6 +145,11 @@
     <target name="jtreg" depends="" description="Run jtreg tests">
         <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
                 classpath="${jtreg.home}/lib/jtreg.jar" />
+        <echo file="${jtreg.dir}/test.props" message="jsk.home=${river.home}"/>
+        <!--Change the httpd port number here-->
+        <!--<echo file="${jtreg.dir}/test.props" message="jsk.port=8081" append="true"/>-->
+        <!--Code Coverage Options-->
+        <!--<echo file="${jtreg.dir}/test.props" message="jcov.options=" append="true"/>-->
         <mkdir dir="${jtreg.dir}/JTlib-tmp" />
         <move todir="${jtreg.dir}/JTlib-tmp">
             <filelist dir="${river.lib.dir}">
@@ -155,16 +160,16 @@
             </filelist>
         </move>
         <move file="${river.lib-ext.dir}/jsk-policy.jar" todir="${jtreg.dir}/JTlib-tmp"/>
-        <jtreg dir="${jtreg.dir}" verbose="all,nopass" failonerror="false"
+        <jtreg  dir="${jtreg.dir}" verbose="all,nopass" failonerror="false"
                 errorproperty="jtreg.fail" failureproperty="jtreg.fail"
                 reportdir="${jtreg.dir}/JTreport" workdir="${jtreg.dir}/JTwork"
                 jdk="${jdk1.5.home}">
             <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="-Djsk.home=${river.home}"/>-->
             <arg value="-Djtlib.tmp=${jtlib.tmp}"/>
+            <!--<arg value="-status:fail"/>-->
             <!--<arg value="-Djava.security.debug=access,failure"/>--> 
             <arg value="-Djavatest.maxOutputSize=500000"/>
-            <!--<arg value="-Djsk.port=8081"/>-->
             <!--<arg value="net/jini/activation/Activatable/inactiveGroup" />-->
         </jtreg>
         <move todir="${river.lib.dir}">
@@ -177,6 +182,7 @@
         </move>
         <move file="${jtreg.dir}/JTlib-tmp/jsk-policy.jar" todir="${river.lib-ext.dir}"/>
         <delete dir="${jtreg.dir}/JTlib-tmp"/>
+        <delete file="${jtreg.dir}/test.props"/>
         <fail if="jtreg.fail"/>
     </target>
 
@@ -192,6 +198,7 @@
         </move>
         <move file="${jtreg.dir}/JTlib-tmp/jsk-policy.jar" todir="${river.lib-ext.dir}"/>
         <delete dir="${jtreg.dir}/JTlib-tmp"/>
+        <delete file="${jtreg.dir}/test.props"/>
     </target>
 
     <macrodef name="testrun">

Modified: incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/activateExceptionTest/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/activateExceptionTest/security.policy?rev=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/activateExceptionTest/security.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/activateExceptionTest/security.policy
Sun Oct 11 11:47:32 2009
@@ -13,7 +13,7 @@
 
 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.io.FilePermission "..${/}..${/}test.props", "read";
 
   // for HTTPD
   permission java.lang.RuntimePermission "createClassLoader";

Modified: incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/activateFailure/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/activateFailure/security.policy?rev=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/activateFailure/security.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/activateFailure/security.policy
Sun Oct 11 11:47:32 2009
@@ -13,7 +13,7 @@
 
 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.io.FilePermission "..${/}..${/}test.props", "read";
 
   // for HTTPD
   permission java.lang.RuntimePermission "createClassLoader";

Modified: incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/checkRegisterInLog/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/checkRegisterInLog/security.policy?rev=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/checkRegisterInLog/security.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/checkRegisterInLog/security.policy
Sun Oct 11 11:47:32 2009
@@ -13,7 +13,7 @@
 
 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.io.FilePermission "..${/}..${/}test.props", "read";
 
   // for HTTPD
   permission java.lang.RuntimePermission "createClassLoader";

Modified: incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/createPrivateActivable/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/createPrivateActivable/security.policy?rev=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/createPrivateActivable/security.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/createPrivateActivable/security.policy
Sun Oct 11 11:47:32 2009
@@ -13,7 +13,7 @@
 
 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.io.FilePermission "..${/}..${/}test.props", "read";
 
   // for HTTPD
   permission java.lang.RuntimePermission "createClassLoader";

Modified: incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/downloadParameterClass/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/downloadParameterClass/security.policy?rev=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/downloadParameterClass/security.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/downloadParameterClass/security.policy
Sun Oct 11 11:47:32 2009
@@ -22,7 +22,7 @@
   permission java.io.FilePermission ".${/}codebase2${/}-", "read,write,delete";
 
   // standard 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.io.FilePermission "..${/}..${/}test.props", "read";
 
   // for HTTPD
   permission java.lang.RuntimePermission "createClassLoader";

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=824055&r1=824054&r2=824055&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
Sun Oct 11 11:47:32 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/Activatable/forceLogSnapshot/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/forceLogSnapshot/security.policy?rev=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/forceLogSnapshot/security.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/forceLogSnapshot/security.policy
Sun Oct 11 11:47:32 2009
@@ -13,7 +13,7 @@
 
 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.io.FilePermission "..${/}..${/}test.props", "read";
 
   // for HTTPD
   permission java.lang.RuntimePermission "createClassLoader";

Modified: incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/inactiveGroup/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/inactiveGroup/security.policy?rev=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/inactiveGroup/security.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/inactiveGroup/security.policy
Sun Oct 11 11:47:32 2009
@@ -13,7 +13,7 @@
 
 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.io.FilePermission "..${/}..${/}test.props", "read";
 
   // for HTTPD
   permission java.lang.RuntimePermission "createClassLoader";

Modified: incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/nestedActivate/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/nestedActivate/security.policy?rev=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/nestedActivate/security.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/nestedActivate/security.policy
Sun Oct 11 11:47:32 2009
@@ -13,7 +13,7 @@
 
 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.io.FilePermission "..${/}..${/}test.props", "read";
 
   // for HTTPD
   permission java.lang.RuntimePermission "createClassLoader";

Modified: incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/nonExistentActivatable/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/nonExistentActivatable/security.policy?rev=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/nonExistentActivatable/security.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/nonExistentActivatable/security.policy
Sun Oct 11 11:47:32 2009
@@ -13,7 +13,7 @@
 
 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.io.FilePermission "..${/}..${/}test.props", "read";
 
   // for HTTPD
   permission java.lang.RuntimePermission "createClassLoader";

Modified: incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/restartCrashedService/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/restartCrashedService/security.policy?rev=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/restartCrashedService/security.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/restartCrashedService/security.policy
Sun Oct 11 11:47:32 2009
@@ -13,7 +13,7 @@
 
 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.io.FilePermission "..${/}..${/}test.props", "read";
 
   // for HTTPD
   permission java.lang.RuntimePermission "createClassLoader";

Modified: incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/restartService/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/restartService/security.policy?rev=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/restartService/security.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/restartService/security.policy
Sun Oct 11 11:47:32 2009
@@ -12,7 +12,7 @@
 
 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.io.FilePermission "..${/}..${/}test.props", "read";
 
   // for HTTPD
   permission java.lang.RuntimePermission "createClassLoader";

Modified: incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/terminateGroup/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/terminateGroup/security.policy?rev=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/terminateGroup/security.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/terminateGroup/security.policy
Sun Oct 11 11:47:32 2009
@@ -13,7 +13,7 @@
 
 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.io.FilePermission "..${/}..${/}test.props", "read";
 
   // for HTTPD
   permission java.lang.RuntimePermission "createClassLoader";

Modified: incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/useProxyAccessor/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/useProxyAccessor/security.policy?rev=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/useProxyAccessor/security.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/Activatable/useProxyAccessor/security.policy
Sun Oct 11 11:47:32 2009
@@ -13,7 +13,7 @@
 
 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.io.FilePermission "..${/}..${/}test.props", "read";
 
   // for HTTPD
   permission java.lang.RuntimePermission "createClassLoader";

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=824055&r1=824054&r2=824055&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
Sun Oct 11 11:47:32 2009
@@ -12,10 +12,9 @@
 
 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.io.FilePermission "..${/}..${/}test.props", "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/net/jini/activation/ActivationSystem/ensureRestart/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/ActivationSystem/ensureRestart/security.policy?rev=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/ActivationSystem/ensureRestart/security.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/ActivationSystem/ensureRestart/security.policy
Sun Oct 11 11:47:32 2009
@@ -12,7 +12,7 @@
 
 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.io.FilePermission "..${/}..${/}test.props", "read";
 
   // for HTTPD
   permission java.lang.RuntimePermission "createClassLoader";

Modified: incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/ActivationSystem/unregisterGroup/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/ActivationSystem/unregisterGroup/security.policy?rev=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/ActivationSystem/unregisterGroup/security.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/activation/ActivationSystem/unregisterGroup/security.policy
Sun Oct 11 11:47:32 2009
@@ -12,7 +12,7 @@
 
 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.io.FilePermission "..${/}..${/}test.props", "read";
 
   // for HTTPD
   permission java.lang.RuntimePermission "createClassLoader";

Modified: incubator/river/jtsk/trunk/qa/jtreg/net/jini/io/MarshalInputStream/verifyWithEqualLoaders/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/io/MarshalInputStream/verifyWithEqualLoaders/security.policy?rev=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/io/MarshalInputStream/verifyWithEqualLoaders/security.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/io/MarshalInputStream/verifyWithEqualLoaders/security.policy
Sun Oct 11 11:47:32 2009
@@ -20,7 +20,7 @@
   permission java.util.PropertyPermission "java.home", "read";
 
   // HTTPD needs these
-    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.lang.RuntimePermission "createClassLoader";
 
   // TestParams needs these??

Modified: incubator/river/jtsk/trunk/qa/jtreg/net/jini/jrmp/echo/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/jrmp/echo/security.policy?rev=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/jrmp/echo/security.policy (original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/jrmp/echo/security.policy Sun Oct 11 11:47:32
2009
@@ -12,7 +12,7 @@
 
 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.io.FilePermission "..${/}..${/}test.props", "read";
 
   // for HTTPD
   permission java.lang.RuntimePermission "createClassLoader";

Modified: incubator/river/jtsk/trunk/qa/jtreg/net/jini/loader/ClassLoading/verifyBeforeLoading/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/loader/ClassLoading/verifyBeforeLoading/security.policy?rev=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/loader/ClassLoading/verifyBeforeLoading/security.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/loader/ClassLoading/verifyBeforeLoading/security.policy
Sun Oct 11 11:47:32 2009
@@ -21,7 +21,7 @@
     permission java.io.FilePermission ".${/}-", "read,write,delete";
 
     // needed to run HTTPD
-      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.util.PropertyPermission "test.src", "read";
     permission java.util.PropertyPermission "java.security.policy", "read";
     permission java.util.PropertyPermission "java.security.manager", "read";

Modified: incubator/river/jtsk/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/checkBoomerangs/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/checkBoomerangs/security.policy?rev=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/checkBoomerangs/security.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/checkBoomerangs/security.policy
Sun Oct 11 11:47:32 2009
@@ -11,7 +11,7 @@
 
 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.io.FilePermission "..${/}..${/}test.props", "read";
 
   // workaround RMIClassLoaderSpi not doing a doPrivileged to find spi resource
   permission java.io.FilePermission "${java.home}${/}lib${/}ext${/}-", "read";

Modified: incubator/river/jtsk/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/checkDefinite/security.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/checkDefinite/security.policy?rev=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/checkDefinite/security.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/checkDefinite/security.policy
Sun Oct 11 11:47:32 2009
@@ -16,7 +16,7 @@
 
   permission java.io.FilePermission ".${/}cbArchive", "read";
   permission java.io.FilePermission ".${/}cbArchive${/}-", "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.lang.RuntimePermission "createClassLoader";
 
   permission java.util.PropertyPermission "test.src", "read";

Modified: incubator/river/jtsk/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/registryRetainCodebase/client.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/registryRetainCodebase/client.policy?rev=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/registryRetainCodebase/client.policy
(original)
+++ incubator/river/jtsk/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/registryRetainCodebase/client.policy
Sun Oct 11 11:47:32 2009
@@ -5,7 +5,7 @@
 
 grant codeBase "file:${jtlib.tmp}/*" {
     permission java.security.AllPermission;
-}
+};
 
 grant {
   // workaround RMIClassLoaderSpi not doing a doPrivileged to find spi resource

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=824055&r1=824054&r2=824055&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/jtreg/testlibrary/TestLibrary.java (original)
+++ incubator/river/jtsk/trunk/qa/jtreg/testlibrary/TestLibrary.java Sun Oct 11 11:47:32 2009
@@ -394,22 +394,14 @@
 	}
 	return props;
     }
-    /**
-     * All properties are now set using -Dproperty="value" using jtreg from the
-     * command line or the build file.
-     * @param property
-     * @param defaultVal
-     * @return
-     */
+    
     public static String getExtraProperty(String property, String defaultVal) { 
-	/*Properties p = (Properties) AccessController.doPrivileged(
+	Properties p = (Properties) AccessController.doPrivileged(
 	    new PrivilegedAction() {
 		public Object run() {
 		    return getExtraProperties();
 		}
 	    });
 	return p.getProperty(property, defaultVal);
-         */
-        return getProperty(property, defaultVal);
     }
 }



Mime
View raw message