river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peter_firmst...@apache.org
Subject svn commit: r1444525 [1/2] - in /river/jtsk/skunk/qa_refactor/trunk: ./ dep-libs/rc-libs/ netbeans/onebigjar/nbproject/ qa/ qa/harness/policy/ qa/jtreg/net/jini/loader/ClassLoading/verifyBeforeLoading/ qa/jtreg/net/jini/loader/pref/PreferredClassProvid...
Date Sun, 10 Feb 2013 10:40:03 GMT
Author: peter_firmstone
Date: Sun Feb 10 10:40:02 2013
New Revision: 1444525

URL: http://svn.apache.org/r1444525
Log:
JTREG test updates::

UriString fix for directory URL paths intended for URLClassLoader

Replace reference-collections with custard-apple (same library, later version) to fix ThreadFactory
permission issue.

Replace Cliff Click's NonBlockingHashMap with ConcurrenHashMap in PreferredClassProvider to
avoid some minor permission issues with unprivileged code.

Added additional logging to PreferredClassProvider.

Added permissions to some jtreg test policy files for new code where applicable.

JIni Standards Documentation updates:

Added JavaSpace05 to specification.

Added:
    river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.2-javadoc.jar  
(with props)
    river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.2-sources.jar  
(with props)
    river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.2-test-sources.jar
  (with props)
    river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.2.jar   (with props)
Removed:
    river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/reference-collections-1.0.1-javadoc.jar
    river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/reference-collections-1.0.1-sources.jar
    river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/reference-collections-1.0.1-test-sources.jar
    river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/reference-collections-1.0.1.jar
Modified:
    river/jtsk/skunk/qa_refactor/trunk/build.xml
    river/jtsk/skunk/qa_refactor/trunk/common.xml
    river/jtsk/skunk/qa_refactor/trunk/netbeans/onebigjar/nbproject/project.properties
    river/jtsk/skunk/qa_refactor/trunk/qa/build.xml
    river/jtsk/skunk/qa_refactor/trunk/qa/harness/policy/defaulttest.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/ClassLoading/verifyBeforeLoading/security.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/arrayClassNames/security.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/checkDefinite/CheckDefinite.java
    river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/checkDefinite/security.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/exerciseProviderConfig/testprovider.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/malformedAncestorURLs/security.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/nonURLAncestor/security.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/security/policy/PolicyFileProvider/basicGrants/Test.java
    river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/security/policy/PolicyFileProvider/umbrellaGrants/Test.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/ClassLoaderTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/ClasspathTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/jinitest.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/qa1.logging
    river/jtsk/skunk/qa_refactor/trunk/src-doc/static/manpages-index.html
    river/jtsk/skunk/qa_refactor/trunk/src-doc/static/spec-index.html
    river/jtsk/skunk/qa_refactor/trunk/src-doc/static/specs/html/js-spec.html

Modified: river/jtsk/skunk/qa_refactor/trunk/build.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/build.xml?rev=1444525&r1=1444524&r2=1444525&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/build.xml (original)
+++ river/jtsk/skunk/qa_refactor/trunk/build.xml Sun Feb 10 10:40:02 2013
@@ -2126,7 +2126,7 @@
         <ant dir="examples/hello" target="compile" inheritall="false" />
     </target>
 
-    <target name="all.doc" depends="jars,river-doc"
+    <target name="all.doc" depends="river-doc"
             description="Generate javadoc for all, including subcomponents">
         <!-- Call qa subcomponent build -->
         <ant dir="qa" target="doc" inheritall="false" />
@@ -2190,14 +2190,14 @@
         <mkdir dir="${test.classes.dir}"/>
         <mkdir dir="${test.results.dir}"/>
         <copy file="dep-libs/high-scale-lib/high-scale-lib.jar" todir="test/lib"/>
-        <copy file="dep-libs/rc-libs/reference-collections-1.0.1.jar" todir="test/lib"/>
+        <copy file="dep-libs/rc-libs/custard-apple-1.0.2.jar" todir="test/lib"/>
     </target>
 
     <target name="clean-tests" depends="">
         <delete dir="${test.classes.dir}" quiet="true"/>
         <delete dir="${test.results.dir}" quiet="true"/>
         <delete file="test/lib/high-scale-lib.jar" quiet="true"/>
-        <delete file="test/lib/reference-collections-1.0.1.jar" quiet="true"/>
+        <delete file="test/lib/custard-apple-1.0.2.jar" quiet="true"/>
     </target> 
     
     <target name="compile-tests" depends="compile,prep-tests">

Modified: river/jtsk/skunk/qa_refactor/trunk/common.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/common.xml?rev=1444525&r1=1444524&r2=1444525&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/common.xml (original)
+++ river/jtsk/skunk/qa_refactor/trunk/common.xml Sun Feb 10 10:40:02 2013
@@ -139,7 +139,7 @@
     </fileset>
     
     <fileset id="reference-collections.jar" dir="${root}/dep-libs/rc-libs">
-        <include name="reference-collections-1.0.1.jar" />
+        <include name="custard-apple-1.0.2.jar" />
     </fileset>
     
     <fileset id="dnsjava.jar" dir="${root}/dep-libs/dnsjava">

Added: river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.2-javadoc.jar
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.2-javadoc.jar?rev=1444525&view=auto
==============================================================================
Binary file - no diff available.

Propchange: river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.2-javadoc.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.2-sources.jar
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.2-sources.jar?rev=1444525&view=auto
==============================================================================
Binary file - no diff available.

Propchange: river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.2-sources.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.2-test-sources.jar
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.2-test-sources.jar?rev=1444525&view=auto
==============================================================================
Binary file - no diff available.

Propchange: river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.2-test-sources.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.2.jar
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.2.jar?rev=1444525&view=auto
==============================================================================
Binary file - no diff available.

Propchange: river/jtsk/skunk/qa_refactor/trunk/dep-libs/rc-libs/custard-apple-1.0.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: river/jtsk/skunk/qa_refactor/trunk/netbeans/onebigjar/nbproject/project.properties
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/netbeans/onebigjar/nbproject/project.properties?rev=1444525&r1=1444524&r2=1444525&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/netbeans/onebigjar/nbproject/project.properties (original)
+++ river/jtsk/skunk/qa_refactor/trunk/netbeans/onebigjar/nbproject/project.properties Sun
Feb 10 10:40:02 2013
@@ -34,13 +34,13 @@ file.reference.asm-3.2.jar=../../dep-lib
 file.reference.asm-commons-3.2.jar=../../dep-libs/asm/asm-commons-3.2.jar
 file.reference.asm-tree-3.2.jar=../../dep-libs/asm/asm-tree-3.2.jar
 file.reference.high-scale-lib.jar=../../dep-libs/high-scale-lib/high-scale-lib.jar
-file.reference.reference-collections-1.0.1.jar=../../dep-libs/rc-libs/reference-collections-1.0.1.jar
+file.reference.custard-apple-1.0.2.jar=../../dep-libs/rc-libs/custard-apple-1.0.2.jar
 file.reference.river-jstk-trunk-src=../../src
 file.reference.velocity-1.7.jar=../../dep-libs/velocity/velocity-1.7.jar
 includes=**
 jar.compress=false
 javac.classpath=\
-    ${file.reference.reference-collections-1.0.1.jar}:\
+    ${file.reference.custard-apple-1.0.2.jar}:\
     ${file.reference.asm-3.2.jar}:\
     ${file.reference.asm-commons-3.2.jar}:\
     ${file.reference.asm-tree-3.2.jar}:\

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/build.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/build.xml?rev=1444525&r1=1444524&r2=1444525&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/build.xml (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/build.xml Sun Feb 10 10:40:02 2013
@@ -207,7 +207,7 @@
                 <file name="phoenix-init.jar"/>
                 <file name="tools.jar"/>
                 <file name="classserver.jar"/>
-                <file name="reference-collections-1.0.1.jar"/>
+                <file name="custard-apple-1.0.2.jar"/>
                 <file name="high-scale-lib.jar"/>
             </filelist>
         </move>
@@ -216,7 +216,7 @@
                 errorproperty="jtreg.fail" failureproperty="jtreg.fail"
                 reportdir="${jtreg.dir}/JTreport" workdir="${jtreg.dir}/JTwork"
                 jdk="${jdk.home}">
-            <arg value="-cpa:${jtlib.tmp}/jsk-policy.jar${path.separator}${jtlib.tmp}/jsk-lib.jar${path.separator}${jtlib.tmp}/jsk-platform.jar${path.separator}${jtlib.tmp}/jsk-resources.jar${path.separator}${jtlib.tmp}/phoenix-init.jar${path.separator}${jtlib.tmp}/tools.jar${path.separator}${jtlib.tmp}/classserver.jar${path.separator}${jtlib.tmp}/reference-collections-1.0.1.jar${path.separator}${jtlib.tmp}/high-scale-lib.jar"/>
+            <arg value="-cpa:${jtlib.tmp}/jsk-policy.jar${path.separator}${jtlib.tmp}/jsk-lib.jar${path.separator}${jtlib.tmp}/jsk-platform.jar${path.separator}${jtlib.tmp}/jsk-resources.jar${path.separator}${jtlib.tmp}/phoenix-init.jar${path.separator}${jtlib.tmp}/tools.jar${path.separator}${jtlib.tmp}/classserver.jar${path.separator}${jtlib.tmp}/custard-apple-1.0.2.jar${path.separator}${jtlib.tmp}/high-scale-lib.jar"/>
             <arg value="-timeout:8"/>
             <!--<arg value="-Djsk.home=${river.home}"/>-->
             <arg value="-Djtlib.tmp=${jtlib.tmp}"/>
@@ -253,7 +253,7 @@
                 <file name="phoenix-init.jar"/>
                 <file name="tools.jar"/>
                 <file name="classserver.jar"/>
-                <file name="reference-collections-1.0.1.jar"/>
+                <file name="custard-apple-1.0.2.jar"/>
                 <file name="high-scale-lib.jar"/>
             </filelist>
         </move>
@@ -273,7 +273,7 @@
                 <file name="phoenix-init.jar"/>
                 <file name="tools.jar"/>
                 <file name="classserver.jar"/>
-                <file name="reference-collections-1.0.1.jar"/>
+                <file name="custard-apple-1.0.2.jar"/>
                 <file name="high-scale-lib.jar"/>
             </filelist>
         </move>
@@ -337,7 +337,7 @@
                         <include name="jsk-platform.jar"/>
                         <include name="jsk-lib.jar"/>
                         <include name="high-scale-lib.jar"/>
-                        <include name="reference-collections-1.0.1.jar"/>
+                        <include name="custard-apple-1.0.2.jar"/>
                     </fileset>
                 </classpath>
                 <env key="SOUL" value="${soul}"/>

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/harness/policy/defaulttest.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/harness/policy/defaulttest.policy?rev=1444525&r1=1444524&r2=1444525&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/harness/policy/defaulttest.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/harness/policy/defaulttest.policy Sun Feb 10 10:40:02
2013
@@ -39,7 +39,7 @@ grant codebase "file:${com.sun.jini.jsk.
     permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
 };
 
-grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}reference-collections-1.0.1.jar"
{
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}custard-apple-1.0.2.jar" {
     permission java.lang.RuntimePermission "modifyThreadGroup";
     permission java.lang.RuntimePermission "setContextClassLoader";
     permission java.lang.RuntimePermission "modifyThread";

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/ClassLoading/verifyBeforeLoading/security.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/ClassLoading/verifyBeforeLoading/security.policy?rev=1444525&r1=1444524&r2=1444525&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/ClassLoading/verifyBeforeLoading/security.policy
(original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/ClassLoading/verifyBeforeLoading/security.policy
Sun Feb 10 10:40:02 2013
@@ -29,4 +29,7 @@ grant {
 
     // to connect to class server
     permission java.net.SocketPermission "*:1024-", "connect";
+
+    // for NonBlockingHashMap
+    permission java.lang.RuntimePermission "accessDeclaredMembers";
 };

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/arrayClassNames/security.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/arrayClassNames/security.policy?rev=1444525&r1=1444524&r2=1444525&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/arrayClassNames/security.policy
(original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/arrayClassNames/security.policy
Sun Feb 10 10:40:02 2013
@@ -13,6 +13,7 @@ grant {
     
     permission java.io.FilePermission "${test.src}", "read";
     permission java.io.FilePermission "${test.src}${/}-", "read";
+    permission java.io.FilePermission "${test.src}${/}..${/}-", "read";
     permission java.io.FilePermission "${test.classes}", "read";
     permission java.io.FilePermission "${test.classes}${/}-", "read";
     permission java.io.FilePermission ".", "read";

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/checkDefinite/CheckDefinite.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/checkDefinite/CheckDefinite.java?rev=1444525&r1=1444524&r2=1444525&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/checkDefinite/CheckDefinite.java
(original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/checkDefinite/CheckDefinite.java
Sun Feb 10 10:40:02 2013
@@ -37,6 +37,8 @@ import java.rmi.server.RMIClassLoader;
 import java.io.IOException;
 import java.io.File;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -60,13 +62,13 @@ public class CheckDefinite {
     static {
 	try {
 	    if (!TestParams.testSrc.startsWith(".")) {
-		SRC_URL = (new URL("file", "",
+		SRC_URL = (new URI("file://" +
 		    (TestParams.testSrc + File.separator).
 		    replace(File.separatorChar, '/')).toString());
 
 		BASE = TestParams.testSrc;
 	    }
-	} catch (MalformedURLException e) {
+	} catch (URISyntaxException e) {
 	    e.printStackTrace();
 	}
     }

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/checkDefinite/security.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/checkDefinite/security.policy?rev=1444525&r1=1444524&r2=1444525&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/checkDefinite/security.policy
(original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/checkDefinite/security.policy
Sun Feb 10 10:40:02 2013
@@ -16,7 +16,7 @@ grant {
 
   permission java.io.FilePermission ".${/}cbArchive", "read";
   permission java.io.FilePermission ".${/}cbArchive${/}-", "read";
-    permission java.io.FilePermission "..${/}..${/}test.props", "read";
+  permission java.io.FilePermission "..${/}..${/}test.props", "read";
   permission java.lang.RuntimePermission "createClassLoader";
 
   permission java.util.PropertyPermission "test.src", "read";
@@ -30,5 +30,8 @@ grant {
 
   permission java.io.FilePermission "${test.src}${/}cbArchive", "read";
   permission java.io.FilePermission "${test.src}${/}cbArchive${/}-", "read";
+  permission java.io.FilePermission "${test.src}${/}..${/}-", "read";
+
+  permission java.lang.RuntimePermission "accessClassInPackage.sun.util.logging.resources";
 };
 

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/exerciseProviderConfig/testprovider.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/exerciseProviderConfig/testprovider.policy?rev=1444525&r1=1444524&r2=1444525&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/exerciseProviderConfig/testprovider.policy
(original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/exerciseProviderConfig/testprovider.policy
Sun Feb 10 10:40:02 2013
@@ -25,4 +25,5 @@ grant {
 
     permission java.lang.RuntimePermission "getProtectionDomain";
     permission java.lang.RuntimePermission "createClassLoader";
+    permission java.lang.RuntimePermission "accessDeclaredMembers";
 };

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/malformedAncestorURLs/security.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/malformedAncestorURLs/security.policy?rev=1444525&r1=1444524&r2=1444525&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/malformedAncestorURLs/security.policy
(original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/malformedAncestorURLs/security.policy
Sun Feb 10 10:40:02 2013
@@ -13,6 +13,7 @@ grant {
     
     permission java.io.FilePermission "${test.src}", "read";
     permission java.io.FilePermission "${test.src}${/}-", "read";
+    permission java.io.FilePermission "${test.src}${/}..${/}-", "read";
     permission java.io.FilePermission "${test.classes}", "read";
     permission java.io.FilePermission "${test.classes}${/}-", "read";
     permission java.io.FilePermission ".", "read";

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/nonURLAncestor/security.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/nonURLAncestor/security.policy?rev=1444525&r1=1444524&r2=1444525&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/nonURLAncestor/security.policy
(original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/loader/pref/PreferredClassProvider/nonURLAncestor/security.policy
Sun Feb 10 10:40:02 2013
@@ -13,6 +13,7 @@ grant {
     
     permission java.io.FilePermission "${test.src}", "read";
     permission java.io.FilePermission "${test.src}${/}-", "read";
+    permission java.io.FilePermission "${test.src}${/}..${/}-", "read";
     permission java.io.FilePermission "${test.classes}", "read";
     permission java.io.FilePermission "${test.classes}${/}-", "read";
     permission java.io.FilePermission ".", "read";

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/security/policy/PolicyFileProvider/basicGrants/Test.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/security/policy/PolicyFileProvider/basicGrants/Test.java?rev=1444525&r1=1444524&r2=1444525&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/security/policy/PolicyFileProvider/basicGrants/Test.java
(original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/security/policy/PolicyFileProvider/basicGrants/Test.java
Sun Feb 10 10:40:02 2013
@@ -145,11 +145,16 @@ public class Test {
 	CodeSource cs =
 	    new CodeSource(new URL(codebase), (Certificate[]) null);
 	PermissionCollection pc = policy.getPermissions(cs);
-	for (int i = 0; i < pass.length; i++) {
-	    if (!pc.implies(pass[i])) {
-		throw new Error(pass[i] + " not implied by " + cs);
-	    }
-	}
+        // This next test has been disabled because ConcurrentPolicyFile
+        // doesn't include Permissions other than AllPermission in the
+        // returned PermissionCollection, this is to avoid performing a 
+        // permission check twice, once in the policy, then again in the
+        // ProtectionDomain.
+//	for (int i = 0; i < pass.length; i++) {
+//	    if (!pc.implies(pass[i])) {
+//		throw new Error(pass[i] + " not implied by " + cs);
+//	    }
+//	}
 	for (int i = 0; i < fail.length; i++) {
 	    if (pc.implies(fail[i])) {
 		throw new Error(fail[i] + " implied by " + cs);

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/security/policy/PolicyFileProvider/umbrellaGrants/Test.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/security/policy/PolicyFileProvider/umbrellaGrants/Test.java?rev=1444525&r1=1444524&r2=1444525&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/security/policy/PolicyFileProvider/umbrellaGrants/Test.java
(original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/jtreg/net/jini/security/policy/PolicyFileProvider/umbrellaGrants/Test.java
Sun Feb 10 10:40:02 2013
@@ -63,11 +63,13 @@ public class Test {
 	CodeSource cs =
 	    new CodeSource(new URL(codebase), (Certificate[]) null);
 	PermissionCollection pc = policy.getPermissions(cs);
-	for (int i = 0; i < pass.length; i++) {
-	    if (!pc.implies(pass[i])) {
-		throw new Error(pass[i] + " not implied by " + cs);
-	    }
-	}
+        // ConcurrentPolicyFile only returns PermissionCollection's
+        // that are privileged AllPermission or empty.
+//	for (int i = 0; i < pass.length; i++) {
+//	    if (!pc.implies(pass[i])) {
+//		throw new Error(pass[i] + " not implied by " + cs);
+//	    }
+//	}
 	for (int i = 0; i < fail.length; i++) {
 	    if (pc.implies(fail[i])) {
 		throw new Error(fail[i] + " implied by " + cs);

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties?rev=1444525&r1=1444524&r2=1444525&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties
(original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties
Sun Feb 10 10:40:02 2013
@@ -132,7 +132,7 @@ net.jini.space.JavaSpace.preparername=te
 # For the shared activation group and its SharedGroupImpl
 #
 sharedGroup.type=group
-sharedGroup.classpath=${com.sun.jini.jsk.home}$/lib$/sharedvm.jar$:${com.sun.jini.jsk.home}$/lib$/reference-collections-1.0.1.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar
+sharedGroup.classpath=${com.sun.jini.jsk.home}$/lib$/sharedvm.jar$:${com.sun.jini.jsk.home}$/lib$/custard-apple-1.0.2.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar
 sharedGroup.starterConfiguration=<url:harness/configs/<config>/starter/starter.config>
 sharedGroup.policyfile=<url:harness/policy/defaultsharedvm.policy>
 sharedGroup.implPrefix=sharedGroupImpl
@@ -154,7 +154,7 @@ sharedGroupImpl.preparername=test.groupP
 nonActivatableGroup.type=nonactivatablegroup
 nonActivatableGroup.impl=com.sun.jini.qa.harness.NonActivatableGroupImpl
 nonActivatableGroup.component=nonActivatableGroup
-nonActivatableGroup.classpath=${com.sun.jini.qa.home}$/lib$/nonactivatablegroup.jar$:${com.sun.jini.jsk.home}$/lib$/start.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/reference-collections-1.0.1.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar
+nonActivatableGroup.classpath=${com.sun.jini.qa.home}$/lib$/nonactivatablegroup.jar$:${com.sun.jini.jsk.home}$/lib$/start.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/custard-apple-1.0.2.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar
 nonActivatableGroup.codebase=http://${HOST}:${com.sun.jini.qa.port}/nonactivatablegroup-dl.jar
 nonActivatableGroup.policyfile=<url:harness/policy/defaultnonactvm.policy>
 nonActivatableGroup.serverjvmargs=-server,${nonActivatableGroup.serverjvmargs}
@@ -176,7 +176,7 @@ vmKiller.starterConfiguration=-
 #
 activationSystem.type=phoenix
 activationSystem.policyfile=<url:harness/policy/defaultphoenix.policy>
-activationSystem.classpath=${com.sun.jini.jsk.home}$/lib$/phoenix.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/reference-collections-1.0.1.jar
+activationSystem.classpath=${com.sun.jini.jsk.home}$/lib$/phoenix.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/custard-apple-1.0.2.jar
 activationSystem.codebase=http://${HOST}:${com.sun.jini.jsk.port}/phoenix-dl.jar http://<gethost>:${com.sun.jini.jsk.port}/jsk-dl.jar
 activationSystem.serviceConfiguration=<url:harness/configs/<config>/phoenix/phoenix.config>
 activationSystem.starterConfiguration=<url:harness/configs/<config>/starter/starter.config>
@@ -252,11 +252,11 @@ testPolicyfile=<url:harness/policy/defau
 # The default classpath. This property must be defined, and must include
 # all Jini dependencies as components
 
-testClasspath=<harnessJar>$:<testJar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/reference-collections-1.0.1.jar
+testClasspath=<harnessJar>$:<testJar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/custard-apple-1.0.2.jar
 
 # Alternate test classpath, for tests that don't use <testJar>
 #
-altClasspath=<harnessJar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/reference-collections-1.0.1.jar
+altClasspath=<harnessJar>$:${com.sun.jini.jsk.home}$/lib$/jsk-platform.jar$:${com.sun.jini.jsk.home}$/lib$/jsk-lib.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/custard-apple-1.0.2.jar
 
 #
 # Services run with server vm; test runs with client vm

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/ClassLoaderTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/ClassLoaderTest.td?rev=1444525&r1=1444524&r2=1444525&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/ClassLoaderTest.td
(original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/ClassLoaderTest.td
Sun Feb 10 10:40:02 2013
@@ -32,4 +32,4 @@ com.sun.jini.test.impl.start.ClassLoader
 com.sun.jini.test.impl.start.ClassLoaderTest2.host=master
 
 include0=start.properties
-sharedGroup.classpath=${com.sun.jini.jsk.home}$/lib$/sharedvm.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/reference-collections-1.0.1.jar$:<file:lib/qa1-start-testservice-common.jar>
+sharedGroup.classpath=${com.sun.jini.jsk.home}$/lib$/sharedvm.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/custard-apple-1.0.2.jar$:<file:lib/qa1-start-testservice-common.jar>

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/ClasspathTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/ClasspathTest.td?rev=1444525&r1=1444524&r2=1444525&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/ClasspathTest.td
(original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/ClasspathTest.td
Sun Feb 10 10:40:02 2013
@@ -33,7 +33,7 @@ com.sun.jini.test.impl.start.ClasspathTe
 com.sun.jini.test.impl.start.ClasspathTest2.host=master
 
 // Shared group overrides
-sharedGroup.classpath=${com.sun.jini.jsk.home}$/lib$/sharedvm.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/reference-collections-1.0.1.jar$:<file:lib/qa1-start-testservice-common.jar>
+sharedGroup.classpath=${com.sun.jini.jsk.home}$/lib$/sharedvm.jar$:${com.sun.jini.jsk.home}$/lib$/high-scale-lib.jar$:${com.sun.jini.jsk.home}$/lib$/custard-apple-1.0.2.jar$:<file:lib/qa1-start-testservice-common.jar>
 sharedGroup.codebase=http://${HOST}:${com.sun.jini.jsk.port}/create-dl.jar http://${HOST}:${com.sun.jini.test.port}/qa1-start-testservice-common-dl.jar
 sharedGroup.policy=<url:harness/policy/all.policy>
 include0=start.properties

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/jinitest.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/jinitest.policy?rev=1444525&r1=1444524&r2=1444525&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/jinitest.policy
(original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/jinitest.policy
Sun Feb 10 10:40:02 2013
@@ -71,7 +71,7 @@ grant codebase "file:${com.sun.jini.jsk.
     permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
 };
 
-grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}reference-collections-1.0.1.jar"
{
+grant codebase "file:${com.sun.jini.jsk.home}${/}lib${/}custard-apple-1.0.2.jar" {
     permission java.lang.RuntimePermission "modifyThreadGroup";
     permission java.lang.RuntimePermission "setContextClassLoader";
     permission java.lang.RuntimePermission "modifyThread";

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/qa1.logging
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/qa1.logging?rev=1444525&r1=1444524&r2=1444525&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/qa1.logging (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/qa1.logging Sun
Feb 10 10:40:02 2013
@@ -184,7 +184,7 @@ com.sun.jini.discovery.level = FINEST
 # For the Helper Utilities
 net.jini.discovery.LookupDiscovery.level = FINEST
 net.jini.discovery.LookupLocatorDiscovery.level = FINEST
-net.jini.lookup.JoinManager.level = INFO
+net.jini.lookup.JoinManager.level = FINEST
 net.jini.lookup.ServiceDiscoveryManager.level = INFO
 net.jini.lease.LeaseRenewalManager.level = INFO
 

Modified: river/jtsk/skunk/qa_refactor/trunk/src-doc/static/manpages-index.html
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src-doc/static/manpages-index.html?rev=1444525&r1=1444524&r2=1444525&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src-doc/static/manpages-index.html (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src-doc/static/manpages-index.html Sun Feb 10 10:40:02
2013
@@ -27,27 +27,31 @@
 
 <hr>
 A set of "manual pages" has been written to assist you in executing the
-<a href="#services">services</a>, <a href="#utilities">utilities</a>,
and 
+<a href="#services">services</a>, <a href="#utilities">utilities</a>,

+<a href="#infastructure">infrastructure</a> and 
 <a href="#tools">tools</a> that are part of the Apache River release. 
 These package.html or class.html files provide implementation 
 specifics for services, utilities, and tools. 
 <ul><a name="services"></a>
 <H2>Services</H2>
 <ul>
+    <!--Please don't replace Jini with River, Jini is the spec, River the implementation
-->
 	<li><a href="api/com/sun/jini/fiddler/package-summary.html">
-	Fiddler</a> - a River lookup discovery service
+	Fiddler</a> - a Jini lookup discovery service implementation
 
 	<li><a href="api/com/sun/jini/mahalo/package-summary.html">
-	Mahalo</a> - a River transaction manager service
+	Mahalo</a> - a Jini transaction manager service implementation
 
 	<li><a href="api/com/sun/jini/mercury/package-summary.html">
-	Mercury</a> - a River event mailbox service
+        Mercury</a> - a Jini event mailbox service implementation.
 
 	<li><a href="api/com/sun/jini/norm/package-summary.html">
-	Norm</a> - a River lease renewal service
+	Norm</a> - a Jini lease renewal service implementation.
 
 	<li><a href="api/com/sun/jini/outrigger/package-summary.html">
-	Outrigger</a> - a JavaSpaces service
+        Outrigger</a> - a JavaSpaces service implementation.
+        
+        <li><a href="http://www.rio-project.org">Rio</a> - 
 
 	<li><a href="api/com/sun/jini/phoenix/package-summary.html">
 	Phoenix</a> - a configurable Java RMI activation system daemon
@@ -86,6 +90,12 @@ specifics for services, utilities, and t
 	<li><a href="api/net/jini/lookup/ServiceDiscoveryManager.html">
 	ServiceDiscoveryManager</a> -  "discovers" services registered with any 
 	number of lookup services of interest for any client-like entity
+        
+ <p>
+</ul><a name="infrastructure"></a>
+<H2>Infrastructure</H2>
+<ul>
+    
 <p>
 </ul><a name="tools"></a>
 <H2>Tools</H2>

Modified: river/jtsk/skunk/qa_refactor/trunk/src-doc/static/spec-index.html
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src-doc/static/spec-index.html?rev=1444525&r1=1444524&r2=1444525&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src-doc/static/spec-index.html (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src-doc/static/spec-index.html Sun Feb 10 10:40:02
2013
@@ -21,12 +21,20 @@
 <body text="#000000" bgcolor="#ffffff" link="#9b37cc"
       vlink="#cc1877" alink="#ffffff">
 
-<h1><center>Jini(TM) Network Technology Specifications<br>Apache River
v2.2.0</center></h1>
-<UL>
-<p>
-The following specifications are available in HTML in this v2.2.0 release.
+<!-- 
+Please do not rename Jini to River.  River is an implementation of the Jini
+specifications.
 
-</P>
+The Jini Specification version is incremented with each River release.
+
+The individual specification documents are individually versioned based on change.
+
+The community must vote on changes to specification documents prior to release.
+
+The trademark for Jini has expired.
+-->
+<h1><center>Jini Network Technology Specifications<br>v2.2.1</center></h1>
+<UL>
 <p>
 The existing specifications were accepted as standards of the Jini Community(SM) 
 through the Jini Community Decision Process (JDP) and have been inherited by the
@@ -35,49 +43,49 @@ to be expected based on learnings from A
 </P>
   	<ul>
         <li><i><a href="specs/html/jini-spec.html">
-            Jini Architecture Specification</i></a>
+            Jini Architecture Specification v1.0</i></a>
         <li><i><a href="specs/html/devicearch-spec.html">
-            Jini Device Architecture Specification</i></a>   
+            Jini Device Architecture Specification v1.0</i></a>   
     	<li><i><a href="specs/html/discovery-spec.html">
-	    Jini Discovery and Join Specification</i></a>
+	    Jini Discovery and Join Specification v3.0</i></a>
     	<li><i><a href="specs/html/entry-spec.html">
-	    Jini Entry Specification</i></a>
+	    Jini Entry Specification v1.0</i></a>
     	<li><i><a href="specs/html/lease-spec.html">
-	    Jini Distributed Leasing Specification</i></a> 
+	    Jini Distributed Leasing Specification v1.0</i></a> 
     	<li><i><a href="specs/html/event-spec.html">
-	    Jini Distributed Events Specification</i></a> 
+	    Jini Distributed Events Specification v1.0</i></a> 
     	<li><i><a href="specs/html/txn-spec.html">
-	    Jini Transaction Specification</i></a> 
+	    Jini Transaction Specification v2.0</i></a> 
     	<li><i><a href="specs/html/lookup-spec.html">
-	    Jini Lookup Service Specification</i></a> 
+	    Jini Lookup Service Specification v1.1</i></a> 
 	</ul></ul>
 
 <HR>
 <p>  
 	<ul><ul>
 	<li><i><a href="specs/html/jxpnote-spec.html">
-	    Introduction to Helper Utilities and Services</i></a> 
+	    Introduction to Helper Utilities and Services v2.0</i></a> 
 	<li><i><a href="specs/html/discoveryutil-spec.html">
-	    Jini Discovery Utilities Specification</i></a>	
+	    Jini Discovery Utilities Specification v3.0</i></a>	
 	<li><i><a href="specs/html/leaseutil-spec.html">
-	    Jini Lease Utilities Specification</i></a>
+	    Jini Lease Utilities Specification v1.0</i></a>
 	<li><i><a href="specs/html/joinutil-spec.html">
-	    Jini Join Utilities Specification</i></a>
+	    Jini Join Utilities Specification v3.0</i></a>
 	<li><i><a href="specs/html/servicediscutil-spec.html">
-	    Jini Service Discovery Utilities Specification</i></a>
+	    Jini Service Discovery Utilities Specification v2.0</i></a>
 	<li><i><a href="specs/html/schema-spec.html">
-	    Jini Lookup Attribute Schema Specification</i></a>
+	    Jini Lookup Attribute Schema Specification v1.0</i></a>
 	<li><i><a href="specs/html/lds-spec.html">
-	    Jini Lookup Discovery Service Specification</i></a>
+	    Jini Lookup Discovery Service Specification v2.0</i></a>
 	<li><i><a href="specs/html/lrs-spec.html">
-	    Jini Lease Renewal Service Specification</i></a>
+	    Jini Lease Renewal Service Specification v1.0</i></a>
 	<li><i><a href="specs/html/mailbox-spec.html">
-	    Jini Event Mailbox Service Specification</i></a>
+	    Jini Event Mailbox Service Specification v2.0</i></a>
 	</ul></ul>
 <HR>
 	<ul><ul>
     	<li><a href="specs/html/js-spec.html"><i>
-	    JavaSpaces Service Specification</i></a>
+	    JavaSpaces Service Specification v2.3</i></a>
 	</ul></ul>
 <HR>
 	<ul><ul>



Mime
View raw message