river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peter_firmst...@apache.org
Subject svn commit: r1609703 [1/3] - in /river/jtsk/skunk/qa_refactor/trunk: ./ modularize/ qa/harness/policy/ qa/src/com/sun/jini/qa/harness/ qa/src/com/sun/jini/test/impl/end2end/e2etest/ qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/ qa/src/co...
Date Fri, 11 Jul 2014 12:01:55 GMT
Author: peter_firmstone
Date: Fri Jul 11 12:01:53 2014
New Revision: 1609703

URL: http://svn.apache.org/r1609703
Log:
Updates for Java 8, including changes to test policy files.
Rename Distributed to Portable
More support for and uses of Generics
LookupLocator now uses same Discovery code as ConstrainableLookupLocator, but without constraints.

Added:
    river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/Portable.java
      - copied, changed from r1599197, river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/Distributed.java
    river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/PortableFactory.java
      - copied, changed from r1599197, river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/SerialReflectionFactory.java
    river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/PortableObjectInputStream.java
      - copied, changed from r1599197, river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/DistributedObjectInputStream.java
    river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/PortableObjectOutputStream.java
      - copied, changed from r1599197, river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/DistributedObjectOutputStream.java
    river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/PortablePermission.java
      - copied, changed from r1599197, river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/DistributePermission.java
    river/jtsk/skunk/qa_refactor/trunk/test/src/org/apache/river/api/io/PortableFactoryTest.java
      - copied, changed from r1599197, river/jtsk/skunk/qa_refactor/trunk/test/src/org/apache/river/api/io/SerialReflectionFactoryTest.java
    river/jtsk/skunk/qa_refactor/trunk/test/src/org/apache/river/api/io/PortableObjectOutputStreamTest.java
      - copied, changed from r1599197, river/jtsk/skunk/qa_refactor/trunk/test/src/org/apache/river/api/io/DistributedObjectOutputStreamTest.java
    river/jtsk/skunk/qa_refactor/trunk/test/src/tests/support/PortableObject.java
      - copied, changed from r1599197, river/jtsk/skunk/qa_refactor/trunk/test/src/tests/support/DistributedObject.java
Removed:
    river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/DistributePermission.java
    river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/Distributed.java
    river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/DistributedObjectInputStream.java
    river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/DistributedObjectOutputStream.java
    river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/SerialReflectionFactory.java
    river/jtsk/skunk/qa_refactor/trunk/test/src/org/apache/river/api/io/DistributedObjectOutputStreamTest.java
    river/jtsk/skunk/qa_refactor/trunk/test/src/org/apache/river/api/io/SerialReflectionFactoryTest.java
    river/jtsk/skunk/qa_refactor/trunk/test/src/tests/support/DistributedObject.java
Modified:
    river/jtsk/skunk/qa_refactor/trunk/   (props changed)
    river/jtsk/skunk/qa_refactor/trunk/build.xml
    river/jtsk/skunk/qa_refactor/trunk/common.xml
    river/jtsk/skunk/qa_refactor/trunk/modularize/ModularizeRiver.groovy
    river/jtsk/skunk/qa_refactor/trunk/qa/harness/policy/defaulttest.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/MergedPolicyProvider.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/NonActivatableGroupAdmin.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/end2end/e2etest/SecureClient.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.0.policy
    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/spec/config/configurationfile/configurationfile.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/constraint/coreconstraint/constraintalternatives/ConstructorsTest.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/constraint/coreconstraint/constraintalternatives/CreateTest.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loader.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoDlPerm.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loader.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoConnectToCodebase.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoDlPerm.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoGetClassLoader.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loader.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoConnectToCodebase.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoDlPerm.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoGetClassLoader.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loader.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoDlPerm.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant01.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrantAll.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoAccessClass.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoGetProperty.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderGrantAll.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderGrant01.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderNoAccessClass.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderNoGetProperty.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderUmbrellaGrant.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrant01.policy
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrantAll.policy
    river/jtsk/skunk/qa_refactor/trunk/src/com/artima/lookup/util/ConsistentMap.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/artima/lookup/util/ConsistentMapEntry.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/artima/lookup/util/ConsistentSet.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/config/Config.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/ClientPermissionChecker.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/DiscoveryConstraints.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/DiscoveryV1.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/kerberos/Client.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/kerberos/Server.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/ssl/Client.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/ssl/Server.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/CommitJob.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/PrepareJob.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/SettlerTask.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/TxnManagerImpl.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/TxnManagerImplInitializer.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/TxnManagerTransaction.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/RegistrarImpl.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/ServiceStarter.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/tool/PreferredListGen.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/tool/envcheck/plugins/CheckActivationSystem.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/tool/envcheck/plugins/CheckPersistence.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/tool/envcheck/plugins/CheckPolicy.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/tool/envcheck/plugins/FileAccessCheckTask.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/config/AbstractConfiguration.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/config/ConfigurationFile.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/config/EmptyConfiguration.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/core/constraint/ConstraintAlternatives.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/core/constraint/InvocationConstraints.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/core/discovery/LookupLocator.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/discovery/ConstrainableLookupLocator.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/io/MarshalInputStream.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/io/MarshalOutputStream.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/io/MarshalledInstance.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/loader/pref/PreferredClassLoader.java
    river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/package.html
    river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/StreamServiceRegistrar.java
    river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/net/RFC3986URLClassLoader.java
    river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/net/URIEncoderDecoder.java
    river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/net/Uri.java
    river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/net/UriParser.java

Propchange: river/jtsk/skunk/qa_refactor/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 11 12:01:53 2014
@@ -1,14 +1,15 @@
+lib
 classes
-LICENSE.txt
-build
-.*
+dist
+deps
+configentry
+nbproject
 lib-dl
 lib-ext
-lib
 build.properties
+build
+LICENSE.txt
 doc
-deps
-configentry
-nbproject
+le
 NOTICE.txt
-dist
+.*

Modified: river/jtsk/skunk/qa_refactor/trunk/build.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/build.xml?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/build.xml (original)
+++ river/jtsk/skunk/qa_refactor/trunk/build.xml Fri Jul 11 12:01:53 2014
@@ -253,9 +253,11 @@
                 <equals arg1="${ant.java.version}" arg2="1.1"/>
                 <equals arg1="${ant.java.version}" arg2="1.2"/>
                 <equals arg1="${ant.java.version}" arg2="1.3"/>
+                <equals arg1="${ant.java.version}" arg2="1.4"/>
+                <equals arg1="${ant.java.version}" arg2="1.5"/>
             </or>
         </condition>
-        <fail if="unsupported.jdk">Building ${product.name} requires Java 2 SDK 1.4 or greater.</fail>
+        <fail if="unsupported.jdk">Building ${product.name} requires JDK 1.6 or greater.</fail>
     </target>
 
     <!-- =========== documentation related ============ -->
@@ -2128,7 +2130,7 @@
             <property name="harness.generateHtml" value="${harness.generateHtml}" />
         </ant>
     </target>
-
+    
     <target name="all.build" depends="river-runtime"
             description="Build all, including subcomponents">
             <!-- Call qa subcomponent build -->

Modified: river/jtsk/skunk/qa_refactor/trunk/common.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/common.xml?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/common.xml (original)
+++ river/jtsk/skunk/qa_refactor/trunk/common.xml Fri Jul 11 12:01:53 2014
@@ -106,6 +106,18 @@
 
     <property name="debug" value="true"/>
     <property name="verbose" value="false"/>
+    <property name="source" value="6"/>
+    <property name="target" value="6"/>
+    <!-- Example add the following lines to build.properties to utilise Java 8 compact profiles
+    target=8
+    profile=compact3
+    -->
+    <condition property="prof" value="-profile ${profile}">
+        <isset property="profile"/>
+    </condition>
+    <condition property="prof" value="">
+        <not><isset property="profile"/></not>
+    </condition>
     <!-- Possible values for 'debuglevel': none or combination of lines,source,vars -->
     <property name="debuglevel" value="lines,source,vars"/>
     <property name="nowarn" value="true"/>
@@ -198,15 +210,15 @@
     </path>
 
     <property name="jre.ext.dir" location="${java.home}/lib/ext"/>
-
+        
     <macrodef name="javac-cmd" description="Run javac">
         <attribute name="source.pat" default="java.source"/>
         <attribute name="source.dir"/>
         <attribute name="dest.dir"/>
         <attribute name="debug" default="${debug}"/>
         <attribute name="debuglevel" default="${debuglevel}"/>
-        <attribute name="source" default="6"/>
-        <attribute name="target" default="6"/>
+        <attribute name="source" default="${source}"/>
+        <attribute name="target" default="${target}"/>
         <attribute name="deprecation" default="${deprecation}"/>
         <attribute name="verbose" default="${verbose}"/>
         <attribute name="nowarn" default="${nowarn}"/>
@@ -223,8 +235,14 @@
                     target="@{target}"
                     verbose="@{verbose}"
                     includeantruntime="false">
+                <compilerarg value="-version" />
                 <patternset refid="@{source.pat}"/>
+                <compilerarg line="${prof}"/>
+                <compilerarg value="-Xlint:unchecked" />
+                <compilerarg value="-Xlint:fallthrough" />
+                <compilerarg value="-Xlint:deprecation" />
                 <javac-cmd-elements/>
+                
             </javac>
         </sequential>
     </macrodef>

Modified: river/jtsk/skunk/qa_refactor/trunk/modularize/ModularizeRiver.groovy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/ModularizeRiver.groovy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/ModularizeRiver.groovy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/ModularizeRiver.groovy Fri Jul 11 12:01:53 2014
@@ -20,6 +20,7 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
 
 def jarMap = [
+        "../lib-ext/jsk-policy.jar"           : "apache-river/river-policy",
         "../lib/jsk-platform.jar"           : "apache-river/river-platform",
         "../lib/jsk-resources.jar"          : "apache-river/river-resources",
         "../lib/start.jar"                  : "apache-river/river-start",
@@ -38,6 +39,7 @@ def jarMap = [
         "../lib-dl/reggie-dl.jar"           : "apache-river/river-services/reggie/reggie-dl",
         "../lib/reggie.jar"                 : "apache-river/river-services/reggie/reggie-service"]
 
+def policy = []
 def platform = []
 def lib = []
 def lib_dl = []
@@ -60,19 +62,26 @@ for(Map.Entry<String, String> entry : ja
             prepAndCopy(zipFile, zipEntry, src, target)
         } else {
             if(!zipEntry.getName().contains("\$") && !zipEntry.isDirectory()) {
-                if(jar.contains("jsk-platform")) {
-                    platform << zipEntry.getName()
+                if (jar.contains("jsk-policy")) {
+                    policy << zipEntry.getName()
                     prepAndCopy(zipFile, zipEntry, src, target)
+                } else if(jar.contains("jsk-platform")) {
+                    platform << zipEntry.getName()
+                    if (skip(zipEntry, policy)){
+                        println "\t- ${zipEntry.getName()}"
+                    } else {
+                        prepAndCopy(zipFile, zipEntry, src, target)
+                    }
                 } else if(jar.contains("jsk-dl") || jar.contains("serviceui")) {
                     lib_dl << zipEntry.getName()
-                    if(skip(zipEntry, platform)) {
+                    if(skip(zipEntry, policy, platform)) {
                         println "\t- ${zipEntry.getName()}"
                     } else {
                         prepAndCopy(zipFile, zipEntry, src, target)
                     }
                 } else if(jar.contains("jsk-lib")) {
                     lib << zipEntry.getName()
-                    if(skip(zipEntry, platform, lib_dl)) {
+                    if(skip(zipEntry, policy, platform, lib_dl)) {
                         println "\t- ${zipEntry.getName()}"
                     } else {
                         prepAndCopy(zipFile, zipEntry, src, target)
@@ -86,7 +95,7 @@ for(Map.Entry<String, String> entry : ja
                         dlJarClassList << zipEntry.name
                         dlMap.put key, dlJarClassList
 
-                        if(skip(zipEntry, platform, lib_dl, lib)) {
+                        if(skip(zipEntry, policy, platform, lib_dl, lib)) {
                             println "\tSkip ${zipEntry.getName()}"
                         } else {
                             prepAndCopy(zipFile, zipEntry, src, target)
@@ -94,7 +103,7 @@ for(Map.Entry<String, String> entry : ja
                     } else {
                         String key = getKeyName(jar)
                         dlJarClassList = dlMap.get(key)
-                        if(skip(zipEntry, platform, lib_dl, lib, dlJarClassList as List)) {
+                        if(skip(zipEntry, policy, platform, lib_dl, lib, dlJarClassList as List)) {
                             println "\tSkip ${zipEntry.getName()}"
                         } else {
                             prepAndCopy(zipFile, zipEntry, src, target)

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=1609703&r1=1609702&r2=1609703&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 Fri Jul 11 12:01:53 2014
@@ -81,7 +81,15 @@ grant {
     permission java.io.FilePermission "${com.sun.jini.jsk.home}${/}lib${/}-", "read";
     permission java.io.FilePermission "${com.sun.jini.qa.home}${/}lib${/}-", "read";
     permission java.util.PropertyPermission "*", "read";
+    permission java.util.PropertyPermission "com.sun.jini.reggie.enableImplToStubReplacement", "read";
     permission java.lang.RuntimePermission "accessClassInPackage.com.sun.proxy";
+    permission java.lang.reflect.ReflectPermission "newProxyInPackage.com.sun.jini.reggie";
+    permission java.lang.reflect.ReflectPermission "newProxyInPackage.com.sun.jini.norm";
+    permission java.lang.reflect.ReflectPermission "newProxyInPackage.com.sun.jini.outrigger";
+    permission java.lang.reflect.ReflectPermission "newProxyInPackage.com.sun.jini.mercury";
+    permission java.lang.reflect.ReflectPermission "newProxyInPackage.com.sun.jini.fiddler";
+    permission java.net.NetPermission "getNetworkInformation";
+    permission java.net.URLPermission "http:*", "GET:";
 };
 
 // needed by some io tests

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/MergedPolicyProvider.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/MergedPolicyProvider.java?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/MergedPolicyProvider.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/MergedPolicyProvider.java Fri Jul 11 12:01:53 2014
@@ -172,11 +172,11 @@ public class MergedPolicyProvider extend
      * Refresh all of the underlying policies.
      */
     public void refresh() {
-	System.out.println("In REFRESH");
+//	System.out.println("In REFRESH");
 	Iterator<Policy> it = policies.iterator();
 	while (it.hasNext()) {
 	    Policy p = it.next();
-	    System.out.println("CALLING refresh on " + p);
+//	    System.out.println("CALLING refresh on " + p);
 	    p.refresh();
 	}
     }

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/NonActivatableGroupAdmin.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/NonActivatableGroupAdmin.java?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/NonActivatableGroupAdmin.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/NonActivatableGroupAdmin.java Fri Jul 11 12:01:53 2014
@@ -19,7 +19,6 @@ package com.sun.jini.qa.harness;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
-import java.io.PrintStream;
 import java.lang.reflect.Field;
 import java.rmi.MarshalledObject;
 import java.rmi.RemoteException;

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/end2end/e2etest/SecureClient.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/end2end/e2etest/SecureClient.java?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/end2end/e2etest/SecureClient.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/end2end/e2etest/SecureClient.java Fri Jul 11 12:01:53 2014
@@ -716,22 +716,24 @@ class SecureClient implements Constants,
     private void doAllConstraints(SmartInterface proxy) {
         logger.writeLog();
         /* loop for all combinations of non-conflicting requirements */
-        for (int req = 0; req < (1 << constraintsArray.length); req++) {
+        int l = constraintsArray.length;
+        for (int req = 0; req < (1 << l); req++) {
             if (((req & BADCONF) == BADCONF)||((req & BADINTEG) == BADINTEG)
                 || ((req & BADDELEG) == BADDELEG)){
                 continue;
             }
             /* split constraints between proxy and context */
             int flags = req;
-            ArrayList reqList = new ArrayList();
-            for (int i = 0; i < constraintsArray.length; i++) {
+            ArrayList<InvocationConstraint> reqList = new ArrayList<InvocationConstraint>(l);
+            for (int i = 0; i < l; i++) {
                 if ((flags & 1) != 0) {
                     reqList.add(constraintsArray[i]);
                 }
                 flags >>= 1;
             }
             /* loop for all combinations of non-conflicting preferences */
-            for (int pref = 0; pref < (1 << preferencesArray.length); pref++) {
+            int len = preferencesArray.length;
+            for (int pref = 0; pref < (1 << len); pref++) {
                 logger.startBoundary("Proxy setup");
                 if ((pref & BADSTRENGTH) == BADSTRENGTH) {
                     continue;
@@ -750,8 +752,8 @@ class SecureClient implements Constants,
                 }
                 /* split preferences between proxy and context */
                 flags = pref;
-                ArrayList prefList = new ArrayList();
-                for (int i = 0; i < preferencesArray.length; i++) {
+                ArrayList<InvocationConstraint> prefList = new ArrayList<InvocationConstraint>(len);
+                for (int i = 0; i < len; i++) {
                     if ((flags & 1) != 0) {
                         prefList.add(preferencesArray[i]);
                     }

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.policy Fri Jul 11 12:01:53 2014
@@ -46,6 +46,7 @@ grant {
     permission java.security.SecurityPermission "getProperty.*";
     permission java.security.SecurityPermission "setPolicy";
     permission java.security.SecurityPermission "getPolicy";
+    permission java.net.SocketPermission "*", "listen,resolve";
 };
 
 grant codeBase "file:${com.sun.jini.test.home}${/}lib${/}qa1-start-cb1.jar" {

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.0.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.0.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.0.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.0.policy Fri Jul 11 12:01:53 2014
@@ -53,6 +53,7 @@ grant {
     permission java.security.SecurityPermission "setPolicy";
     permission java.security.SecurityPermission "getPolicy";
     permission java.util.PropertyPermission "*", "read";
+    permission java.net.SocketPermission "*", "listen,resolve";
 };
 
 grant codeBase "file:${com.sun.jini.jsk.home}/foo/*" {

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=1609703&r1=1609702&r2=1609703&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 Fri Jul 11 12:01:53 2014
@@ -11,6 +11,7 @@ grant {
         permission java.util.PropertyPermission "java.system.class.loader", "read";
 	permission java.io.FilePermission "${com.sun.jini.test.home}${/}lib${/}-", "read";
         permission java.util.PropertyPermission "com.sun.jini.reggie.enableImplToStubReplacement", "read";
+        permission java.net.URLPermission "http:*", "GET:";
 };
 
 grant {

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/config/configurationfile/configurationfile.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/config/configurationfile/configurationfile.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/config/configurationfile/configurationfile.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/config/configurationfile/configurationfile.policy Fri Jul 11 12:01:53 2014
@@ -36,7 +36,8 @@ grant {
     permission java.net.SocketPermission "*:1024-8082", "connect,accept"; 
     permission java.net.SocketPermission "*:8083",      "accept"; 
     permission java.net.SocketPermission "224.0.1.84", "connect,accept"; 
-    permission java.net.SocketPermission "224.0.1.85", "connect,accept"; 
+    permission java.net.SocketPermission "224.0.1.85", "connect,accept";
+    permission java.net.SocketPermission "*", "listen,resolve";
 
     permission java.io.FilePermission "${com.sun.jini.qa.harness.propfile}",  "read"; 
     permission java.io.FilePermission "${com.sun.jini.jsk.home}",    "read"; 

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/constraint/coreconstraint/constraintalternatives/ConstructorsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/constraint/coreconstraint/constraintalternatives/ConstructorsTest.java?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/constraint/coreconstraint/constraintalternatives/ConstructorsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/constraint/coreconstraint/constraintalternatives/ConstructorsTest.java Fri Jul 11 12:01:53 2014
@@ -572,7 +572,7 @@ public class ConstructorsTest extends Ab
      * constructor or null if no exception is expected
      * @throws TestException if any verification fails
      */
-    protected void callConstructor(Object tc, Collection c, Class ex)
+    protected void callConstructor(Object tc, Collection<InvocationConstraint> c, Class ex)
             throws TestException {
 
         /*
@@ -651,7 +651,7 @@ public class ConstructorsTest extends Ab
         InvocationConstraint constraintBefore = null;
 
         try {
-            constraintBefore = ConstraintAlternatives.create((Collection) c);
+            constraintBefore = ConstraintAlternatives.create(c);
         } catch (Exception e) {
             throw new TestException("Exception is thrown while invoking"
                     + " ConstraintAlternatives.create() method", e);

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/constraint/coreconstraint/constraintalternatives/CreateTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/constraint/coreconstraint/constraintalternatives/CreateTest.java?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/constraint/coreconstraint/constraintalternatives/CreateTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/constraint/coreconstraint/constraintalternatives/CreateTest.java Fri Jul 11 12:01:53 2014
@@ -828,7 +828,7 @@ public class CreateTest extends QATestEn
                 + "Argument passed to ConstraintAlternatives.create() methods"
                 + " is non-null, but contains null element");
         {
-            Collection argColl = new ArrayList();
+            Collection<InvocationConstraint> argColl = new ArrayList<InvocationConstraint>();
             argColl.add(ClientAuthentication.YES);
             argColl.add(null);
 
@@ -837,8 +837,7 @@ public class CreateTest extends QATestEn
                 throw new TestException(
                         "" + " test failed");
             }
-            InvocationConstraint[] argArray = (InvocationConstraint[])
-                    argColl.toArray(new InvocationConstraint[0]);
+            InvocationConstraint[] argArray = argColl.toArray(new InvocationConstraint[0]);
 
             if (!checkException(argArray,
                     java.lang.NullPointerException.class)) {
@@ -950,12 +949,12 @@ public class CreateTest extends QATestEn
      * @return true if all checks for both method are satisfied or
      *         false otherwise
      */
-    public boolean checker(Collection c, InvocationConstraint ic) {
+    public boolean checker(Collection<InvocationConstraint> c, InvocationConstraint ic) {
 
         /*
          * Argument for ConstraintAlternatives.create(Collection) method
          */
-        Collection argC;
+        Collection<InvocationConstraint> argC;
 
         /*
          * Argument for ConstraintAlternatives.create(InvocationConstraint[])
@@ -970,13 +969,12 @@ public class CreateTest extends QATestEn
         InvocationConstraint[] argACopy;
 
         try {
-            argC = new ArrayList(c);
+            argC = new ArrayList<InvocationConstraint>(c);
             logger.log(Level.FINE,
                     "Collection used as an argument for"
                     + " ConstraintAlternatives.create(Collection) method::\n"
                     + argC);
-            argA = (InvocationConstraint[]) c.toArray(new
-                    InvocationConstraint[0]);
+            argA = c.toArray(new InvocationConstraint[0]);
             logger.log(Level.FINE,
                     "Array used as an argument for"
                     + " ConstraintAlternatives.create(InvocationConstraint[])"
@@ -1094,7 +1092,7 @@ public class CreateTest extends QATestEn
      * @return true if ConstraintAlternatives.create() method throws exception
      *         type of which is equal to the expected one or false otherwise
      */
-    public boolean checkException(Collection c, Class cl) {
+    public boolean checkException(Collection<InvocationConstraint> c, Class cl) {
         // Testing ConstraintAlternatives.create(Collection) method
         logger.log(Level.FINE,
                 "+++ Testing ConstraintAlternatives.create(Collection) ...");

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loader.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loader.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loader.policy Fri Jul 11 12:01:53 2014
@@ -45,7 +45,7 @@ grant codebase "file:${com.sun.jini.qa.h
 
 grant { 
     permission java.io.FilePermission "<<ALL FILES>>", "read";
-    permission java.net.SocketPermission "*",    "connect,accept"; 
+    permission java.net.SocketPermission "*", "connect,accept,listen,resolve"; 
     permission java.lang.RuntimePermission "getProtectionDomain";
     permission java.lang.RuntimePermission "setFactory";
     permission java.security.SecurityPermission "getDomainCombiner";

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoDlPerm.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoDlPerm.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoDlPerm.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/loaderNoDlPerm.policy Fri Jul 11 12:01:53 2014
@@ -20,7 +20,7 @@ grant codebase "file:${com.sun.jini.jsk.
  * 3. allow call setFactory().
  */
 grant { 
-    permission java.net.SocketPermission "*",    "connect,accept"; 
+    permission java.net.SocketPermission "*", "connect,accept,listen,resolve"; 
     permission java.lang.RuntimePermission "getProtectionDomain";
     permission java.lang.RuntimePermission "setFactory";
 };

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loader.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loader.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loader.policy Fri Jul 11 12:01:53 2014
@@ -45,7 +45,7 @@ grant codebase "file:${com.sun.jini.qa.h
 
 grant { 
     permission java.io.FilePermission "<<ALL FILES>>", "read";
-    permission java.net.SocketPermission "*",    "connect,accept"; 
+    permission java.net.SocketPermission "*", "connect,accept,listen,resolve"; 
     permission java.lang.RuntimePermission "getProtectionDomain";
     permission java.lang.RuntimePermission "setFactory";
     permission java.security.SecurityPermission "getDomainCombiner";

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoConnectToCodebase.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoConnectToCodebase.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoConnectToCodebase.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoConnectToCodebase.policy Fri Jul 11 12:01:53 2014
@@ -140,4 +140,7 @@ grant { 
     // discovery-specific PropertyPermission needed by the harness
     permission net.jini.discovery.DiscoveryPermission "*"; 
     permission java.lang.RuntimePermission "getenv.SOUL";
+    permission java.net.NetPermission "getNetworkInformation";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.util.logging.resources";
+    permission java.net.SocketPermission "*", "listen,resolve";
 };

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoDlPerm.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoDlPerm.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoDlPerm.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoDlPerm.policy Fri Jul 11 12:01:53 2014
@@ -21,7 +21,7 @@ grant codebase "file:${com.sun.jini.jsk.
  * 3. allow call setFactory().
  */
 grant { 
-    permission java.net.SocketPermission "*",    "connect,accept"; 
+    permission java.net.SocketPermission "*", "connect,accept,listen,resolve"; 
     permission java.lang.RuntimePermission "getProtectionDomain";
     permission java.lang.RuntimePermission "setFactory";
 };

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoGetClassLoader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoGetClassLoader.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoGetClassLoader.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/loaderNoGetClassLoader.policy Fri Jul 11 12:01:53 2014
@@ -29,7 +29,9 @@ grant codebase "file:${com.sun.jini.jsk.
 
 grant { 
     permission java.net.SocketPermission "*",    "connect,accept"; 
+    permission java.net.SocketPermission "*",    "listen,resolve";
     permission java.lang.RuntimePermission "getProtectionDomain";
+    permission java.net.NetPermission "getNetworkInformation";
 };
 
 /*

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loader.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loader.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loader.policy Fri Jul 11 12:01:53 2014
@@ -46,7 +46,7 @@ grant codebase "file:${com.sun.jini.qa.h
 
 grant { 
     permission java.io.FilePermission "<<ALL FILES>>", "read";
-    permission java.net.SocketPermission "*",    "connect,accept"; 
+    permission java.net.SocketPermission "*", "connect,accept,listen,resolve"; 
     permission java.lang.RuntimePermission "getProtectionDomain";
     permission java.lang.RuntimePermission "setFactory";
     permission java.security.SecurityPermission "getDomainCombiner";

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoConnectToCodebase.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoConnectToCodebase.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoConnectToCodebase.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoConnectToCodebase.policy Fri Jul 11 12:01:53 2014
@@ -38,6 +38,9 @@ grant { 
     permission java.lang.RuntimePermission "createSecurityManager";
     permission java.lang.RuntimePermission "setSecurityManager";
     permission java.lang.RuntimePermission "setIO";
+    permission java.net.NetPermission "getNetworkInformation";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.util.logging.resources";
+    permission java.net.SocketPermission "*", "listen,resolve";
     permission javax.security.auth.AuthPermission "createLoginContext.com.sun.jini.Test";
     permission javax.security.auth.AuthPermission "doAs";
 

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoDlPerm.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoDlPerm.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoDlPerm.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoDlPerm.policy Fri Jul 11 12:01:53 2014
@@ -20,7 +20,7 @@ grant codebase "file:${com.sun.jini.jsk.
  * 3. allow call setFactory().
  */
 grant { 
-    permission java.net.SocketPermission "*",    "connect,accept"; 
+    permission java.net.SocketPermission "*", "connect,accept,listen,resolve"; 
     permission java.lang.RuntimePermission "getProtectionDomain";
     permission java.lang.RuntimePermission "setFactory";
 };

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoGetClassLoader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoGetClassLoader.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoGetClassLoader.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/loaderNoGetClassLoader.policy Fri Jul 11 12:01:53 2014
@@ -30,7 +30,9 @@ grant codebase "file:${com.sun.jini.jsk.
 
 grant { 
     permission java.net.SocketPermission "*",    "connect,accept"; 
+    permission java.net.SocketPermission "*",    "listen,resolve";
     permission java.lang.RuntimePermission "getProtectionDomain";
+    permission java.net.NetPermission "getNetworkInformation";
 };
 
 /*
@@ -49,6 +51,7 @@ grant { 
     permission java.lang.RuntimePermission "createSecurityManager";
     permission java.lang.RuntimePermission "setSecurityManager";
     permission java.lang.RuntimePermission "setIO";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.util.logging.resources";
     permission javax.security.auth.AuthPermission "createLoginContext.com.sun.jini.Test";
     permission javax.security.auth.AuthPermission "doAs";
 

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loader.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loader.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loader.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loader.policy Fri Jul 11 12:01:53 2014
@@ -44,7 +44,7 @@ grant codebase "file:${com.sun.jini.qa.h
 
 grant { 
     permission java.io.FilePermission "<<ALL FILES>>", "read";
-    permission java.net.SocketPermission "*",    "connect,accept"; 
+    permission java.net.SocketPermission "*", "connect,accept,listen,resolve"; 
     permission java.lang.RuntimePermission "getProtectionDomain";
     permission java.lang.RuntimePermission "setFactory";
     permission java.security.SecurityPermission "getDomainCombiner";

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoDlPerm.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoDlPerm.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoDlPerm.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loaderNoDlPerm.policy Fri Jul 11 12:01:53 2014
@@ -20,7 +20,7 @@ grant codebase "file:${com.sun.jini.jsk.
  * 3. allow call setFactory().
  */
 grant { 
-    permission java.net.SocketPermission "*",    "connect,accept"; 
+    permission java.net.SocketPermission "*", "connect,accept,listen,resolve"; 
     permission java.lang.RuntimePermission "getProtectionDomain";
     permission java.lang.RuntimePermission "setFactory";
 };

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant01.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant01.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant01.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrant01.policy Fri Jul 11 12:01:53 2014
@@ -82,7 +82,8 @@ grant codebase "http://*:${com.sun.jini.
 };
 
 grant { 
-    permission java.net.SocketPermission "*",    "connect,accept"; 
+    permission java.net.SocketPermission "*", "connect,accept";
+    permission java.net.SocketPermission "*", "listen,resolve";
     permission java.lang.RuntimePermission "getProtectionDomain";
     permission java.lang.RuntimePermission "setFactory";
 };

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrantAll.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrantAll.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrantAll.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderGrantAll.policy Fri Jul 11 12:01:53 2014
@@ -61,9 +61,11 @@ grant codebase "http://*:${com.sun.jini.
 };
 
 grant { 
-    permission java.net.SocketPermission "*",    "connect,accept"; 
+    permission java.net.SocketPermission "*", "connect,accept";
+    permission java.net.SocketPermission "*", "listen,resolve";
     permission java.lang.RuntimePermission "getProtectionDomain";
     permission java.lang.RuntimePermission "setFactory";
+    permission java.lang.RuntimePermission "getenv.SOUL";
 };
 
 /*

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoAccessClass.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoAccessClass.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoAccessClass.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoAccessClass.policy Fri Jul 11 12:01:53 2014
@@ -47,6 +47,8 @@ grant { 
     permission javax.security.auth.AuthPermission "createLoginContext.com.sun.jini.Test";
     permission javax.security.auth.AuthPermission "doAs";
     permission java.lang.RuntimePermission "accessClassInPackage.sun.misc";
+    permission java.lang.RuntimePermission "getenv.SOUL";
+    permission java.net.SocketPermission "*", "listen,resolve";
 
     // Allow reflection to examine service starter framework classes
     permission java.lang.RuntimePermission "accessDeclaredMembers";

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoGetProperty.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoGetProperty.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoGetProperty.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/dynamicPolicyProvider/policyProviderNoGetProperty.policy Fri Jul 11 12:01:53 2014
@@ -36,6 +36,10 @@ grant {
         "setProperty.net.jini.security.policy.*";
     permission java.lang.RuntimePermission
         "accessClassInPackage.sun.security.provider";
+    permission java.net.NetPermission "getNetworkInformation";
+    permission java.net.SocketPermission "*", "listen,resolve";
+    permission java.lang.RuntimePermission "getenv.SOUL";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.util.logging.resources";
 };
 
 /*

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderGrantAll.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderGrantAll.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderGrantAll.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/grantPermission/policyProviderGrantAll.policy Fri Jul 11 12:01:53 2014
@@ -38,6 +38,10 @@ grant {
         "setProperty.net.jini.security.policy.*";
     permission java.lang.RuntimePermission
         "accessClassInPackage.sun.security.provider";
+    permission java.net.NetPermission "getNetworkInformation";
+    permission java.net.SocketPermission "*", "listen,resolve";
+    permission java.lang.RuntimePermission "getenv.SOUL";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.util.logging.resources";
 };
 
 /*

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderGrant01.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderGrant01.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderGrant01.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderGrant01.policy Fri Jul 11 12:01:53 2014
@@ -65,7 +65,9 @@ grant codebase "http://*:${com.sun.jini.
 };
 
 grant { 
-    permission java.net.SocketPermission "*",    "connect,accept"; 
+    permission java.net.SocketPermission "*", "connect,accept";
+    permission java.net.SocketPermission "*", "listen,resolve";
+    permission java.lang.RuntimePermission "getenv.SOUL";
     permission java.lang.RuntimePermission "getProtectionDomain";
     permission java.lang.RuntimePermission "setFactory";
 };

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderNoAccessClass.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderNoAccessClass.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderNoAccessClass.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderNoAccessClass.policy Fri Jul 11 12:01:53 2014
@@ -55,11 +55,13 @@ grant { 
 
     // Allow loading of Sun's RMI impl classes
     permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.server";
+    permission java.lang.RuntimePermission "getenv.SOUL";
 
 
     permission java.net.SocketPermission "*:1024-",    "connect,accept"; 
     permission java.net.SocketPermission "224.0.1.84", "connect,accept"; 
-    permission java.net.SocketPermission "224.0.1.85", "connect,accept"; 
+    permission java.net.SocketPermission "224.0.1.85", "connect,accept";
+    permission java.net.SocketPermission "*", "listen,resolve";
 
     // File read,write,delete permissions. 
     // 

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderNoGetProperty.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderNoGetProperty.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderNoGetProperty.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderNoGetProperty.policy Fri Jul 11 12:01:53 2014
@@ -60,11 +60,13 @@ grant { 
 
     // Allow loading of Sun's RMI impl classes
     permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.server";
+    permission java.lang.RuntimePermission "getenv.SOUL";
 
 
     permission java.net.SocketPermission "*:1024-",    "connect,accept"; 
     permission java.net.SocketPermission "224.0.1.84", "connect,accept"; 
-    permission java.net.SocketPermission "224.0.1.85", "connect,accept"; 
+    permission java.net.SocketPermission "224.0.1.85", "connect,accept";
+    permission java.net.SocketPermission "*", "listen,resolve";
 
     // File read,write,delete permissions. 
     // 

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderUmbrellaGrant.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderUmbrellaGrant.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderUmbrellaGrant.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyFileProvider/policyProviderUmbrellaGrant.policy Fri Jul 11 12:01:53 2014
@@ -67,9 +67,11 @@ grant codebase "http://*:${com.sun.jini.
 };
 
 grant { 
-    permission java.net.SocketPermission "*",    "connect,accept"; 
+    permission java.net.SocketPermission "*", "connect,accept";
+    permission java.net.SocketPermission "*", "listen,resolve";
     permission java.lang.RuntimePermission "getProtectionDomain";
     permission java.lang.RuntimePermission "setFactory";
+    permission java.lang.RuntimePermission "getenv.SOUL";
 };
 
 /*

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrant01.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrant01.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrant01.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrant01.policy Fri Jul 11 12:01:53 2014
@@ -49,7 +49,10 @@ grant {
         "accessClassInPackage.sun.security.provider";
     permission java.security.SecurityPermission "getDomainCombiner";
     permission java.security.SecurityPermission "createAccessControlContext";
-
+    permission java.net.NetPermission "getNetworkInformation";
+    permission java.net.SocketPermission "*", "listen,resolve";
+    permission java.lang.RuntimePermission "getenv.SOUL";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.util.logging.resources";
 };
 
 /*

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrantAll.policy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrantAll.policy?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrantAll.policy (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/policyprovider/policyProviderGrantAll.policy Fri Jul 11 12:01:53 2014
@@ -53,9 +53,11 @@ grant codebase "http://*:${com.sun.jini.
 };
 
 grant { 
-    permission java.net.SocketPermission "*",    "connect,accept"; 
+    permission java.net.SocketPermission "*", "connect,accept";
+    permission java.net.SocketPermission "*", "listen,resolve";
     permission java.lang.RuntimePermission "getProtectionDomain";
     permission java.lang.RuntimePermission "setFactory";
+    permission java.lang.RuntimePermission "getenv.SOUL";
 };
 
 /*

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/artima/lookup/util/ConsistentMap.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/artima/lookup/util/ConsistentMap.java?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/artima/lookup/util/ConsistentMap.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/artima/lookup/util/ConsistentMap.java Fri Jul 11 12:01:53 2014
@@ -24,6 +24,7 @@ import java.util.Iterator;
 import java.util.HashSet;
 import java.util.AbstractMap;
 import java.io.Serializable;
+import java.util.Collections;
 
 /**
  * An implementation of the <code>java.util.Map</code> interface that has
@@ -46,7 +47,7 @@ import java.io.Serializable;
  *
  * @author Bill Venners
  */
-public class ConsistentMap extends AbstractMap implements Serializable {
+public class ConsistentMap<K,V> extends AbstractMap<K,V> implements Serializable {
 
     private static final long serialVersionUID = -5223157327307155247L;
 
@@ -54,14 +55,14 @@ public class ConsistentMap extends Abstr
      * @serial A <code>Set</code> of <code>java.util.Map.Entry</code> objects,
      *     the key-value pairs contained in this <code>ConsistentMap</code>.
      */
-    private Set entrySet;
+    private final Set<Map.Entry<K,V>> entrySet;
 
     /**
      * Constructs a new, empty <code>ConsistentMap</code>. All instances
      * of <code>ConsistentMap</code> are unmodifiable.
      */
     public ConsistentMap() {
-        entrySet = new ConsistentSet(new HashSet());
+        entrySet = new ConsistentSet<Map.Entry<K,V>>(new HashSet<Map.Entry<K,V>>());
     }
 
     /**
@@ -73,7 +74,7 @@ public class ConsistentMap extends Abstr
      * @throws  NullPointerException if the passed <code>init</code> reference
      *     is <code>null</code>
      */
-    public ConsistentMap(Map init) {
+    public ConsistentMap(Map<K,V> init) {
 
         if (init == null) {
             throw new NullPointerException();
@@ -81,13 +82,13 @@ public class ConsistentMap extends Abstr
 
         // Must put the key-value pairs into ConsistentMapEntry objects,
         // so they'll behave correctly when setValue() is invoked on them.
-        HashSet unmodEntries = new HashSet();
-        Set entries = init.entrySet();
-        Iterator it = entries.iterator();
+        Set<Map.Entry<K,V>> unmodEntries = new HashSet<Map.Entry<K,V>>(init.size());
+        Set<Map.Entry<K,V>> entries = init.entrySet();
+        Iterator<Map.Entry<K,V>> it = entries.iterator();
         while (it.hasNext()) {
 
-            Map.Entry entry = (Map.Entry) it.next();
-            Map.Entry unmodEntry = new ConsistentMapEntry(entry.getKey(), entry.getValue());
+            Map.Entry<K,V> entry = it.next();
+            Map.Entry<K,V> unmodEntry = new ConsistentMapEntry<K,V>(entry.getKey(), entry.getValue());
             unmodEntries.add(unmodEntry);
         }
         entrySet = new ConsistentSet(unmodEntries);
@@ -101,9 +102,9 @@ public class ConsistentMap extends Abstr
      * @return a set view of the mappings contained in this
      *     <code>ConsistentMap</code>.
      */
-    public Set entrySet() {
-
-        return entrySet;
+    @Override
+    public Set<Map.Entry<K,V>> entrySet() {
+        return Collections.unmodifiableSet(entrySet);
     }
 }
 

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/artima/lookup/util/ConsistentMapEntry.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/artima/lookup/util/ConsistentMapEntry.java?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/artima/lookup/util/ConsistentMapEntry.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/artima/lookup/util/ConsistentMapEntry.java Fri Jul 11 12:01:53 2014
@@ -42,19 +42,19 @@ import java.io.Serializable;
  *
  * @author Bill Venners
  */
-final class ConsistentMapEntry implements Map.Entry, Serializable {
+final class ConsistentMapEntry<K,V> implements Map.Entry<K,V>, Serializable {
 
     private static final long serialVersionUID = -8633627011729114409L;
 
     /**
      * @serial An <code>Object</code> key, or <code>null</code>
      */
-    private Object key;
+    private final K key;
 
     /**
      * @serial An <code>Object</code> value, or <code>null</code>
      */
-    private Object value;
+    private final V value;
 
     /**
      * Constructs a new <code>ConsistentMapEntry</code> with passed
@@ -64,7 +64,7 @@ final class ConsistentMapEntry implement
      * @param key the key (<code>null</code> key is OK)
      * @param value the value (<code>null</code> value is OK) associated with the key
      */
-    public ConsistentMapEntry(Object key, Object value) {
+    public ConsistentMapEntry(K key, V value) {
 
         this.key = key;
         this.value = value;
@@ -75,7 +75,8 @@ final class ConsistentMapEntry implement
      *
      * @return the key.
      */
-    public Object getKey() {
+    @Override
+    public K getKey() {
         return key;
     }
 
@@ -84,7 +85,8 @@ final class ConsistentMapEntry implement
      *
      * @return the value.
      */
-    public Object getValue() {
+    @Override
+    public V getValue() {
         return value;
     }
 
@@ -95,7 +97,8 @@ final class ConsistentMapEntry implement
      *
      * @throws UnsupportedOperationException always
      */
-    public Object setValue(Object value) {
+    @Override
+    public V setValue(V value) {
         throw new UnsupportedOperationException();
     }
 
@@ -113,6 +116,7 @@ final class ConsistentMapEntry implement
      * @return <code>true</code> if the objects are the semantically equal,
      *     <code>false</code> otherwise.
      */
+    @Override
     public boolean equals(Object o) {
 
         if (o == null) {
@@ -145,6 +149,7 @@ final class ConsistentMapEntry implement
      *
      * @return the hashcode for this object
      */ 
+    @Override
     public int hashCode() {
 
         int keyHash = (key == null ? 0 : key.hashCode());

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/artima/lookup/util/ConsistentSet.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/artima/lookup/util/ConsistentSet.java?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/artima/lookup/util/ConsistentSet.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/artima/lookup/util/ConsistentSet.java Fri Jul 11 12:01:53 2014
@@ -18,11 +18,12 @@
 
 package com.artima.lookup.util;
 
-import java.util.HashSet;
-import java.util.Collection;
+import java.io.Serializable;
 import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.Iterator;
-import java.io.Serializable;
+import java.util.Set;
 
 /**
  * An implementation of the <code>java.util.Set</code> interface that has
@@ -45,7 +46,7 @@ import java.io.Serializable;
  *
  * @author Bill Venners
  */
-public class ConsistentSet extends AbstractSet implements Serializable {
+public class ConsistentSet<T> extends AbstractSet<T> implements Serializable {
 
     private static final long serialVersionUID = -533615203387369436L;
 
@@ -53,14 +54,14 @@ public class ConsistentSet extends Abstr
      * @serial An array of the <code>Object</code> elements contained in
      *     this <code>ConsistentSet</code>.
      */
-    private Object[] elements;
+    private final T[] elements;
 
     /**
      * Constructs a new, empty <code>ConsistentSet</code>. All instances
      * of <code>ConsistentSet</code> are unmodifiable.
      */
     public ConsistentSet() {
-        elements = new Object[0];
+        elements = (T[]) new Object[0];
     }
 
     /**
@@ -72,21 +73,16 @@ public class ConsistentSet extends Abstr
      * @throws NullPointerException if the passed <code>init</code> reference
      *     is <code>null</code>
      */
-    public ConsistentSet(Collection init) {
+    public ConsistentSet(Collection<T> init) {
 
         if (init == null) {
             throw new NullPointerException();
         }
 
         // Put the collection in a HashSet to get rid of duplicates
-        HashSet tempSet = new HashSet(init);
+        Set<T> tempSet = new HashSet<T>(init);
 
-        elements = new Object[tempSet.size()];
-
-        Iterator it = tempSet.iterator();
-        for (int i = 0; it.hasNext(); ++i) {
-            elements[i] = it.next();
-        }
+        elements = tempSet.toArray((T[]) new Object[init.size()]);
     }
 
     /**
@@ -99,22 +95,26 @@ public class ConsistentSet extends Abstr
      * @return an <code>Iterator</code> over the elements in this
      *     <code>ConsistentSet</code>.
      */
-    public Iterator iterator() {
+    @Override
+    public Iterator<T> iterator() {
 
         return new Iterator() {
 
             private int nextPos = 0;
 
+            @Override
             public boolean hasNext() {
                 return nextPos < elements.length;
             }
 
-            public Object next() {
-                Object next = elements[nextPos];
+            @Override
+            public T next() {
+                T next = elements[nextPos];
                 ++nextPos;
                 return next;
             }
 
+            @Override
             public void remove() {
                 throw new IllegalArgumentException();
             }
@@ -126,6 +126,7 @@ public class ConsistentSet extends Abstr
      *
      * @return the number of elements in this <code>ConsistentSet</code> (its cardinality).
      */
+    @Override
     public int size() {
         return elements.length;
     }

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/config/Config.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/config/Config.java?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/config/Config.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/config/Config.java Fri Jul 11 12:01:53 2014
@@ -185,8 +185,8 @@ public class Config {
 	if (defaultValue == null) 
 	    throw new NullPointerException("defaultValue cannot be null");
 
-	final T result = (T) config.getEntry(component, name, type,
-					      (T) defaultValue, data);
+	final T result = config.getEntry(component, name, type,
+					       defaultValue, data);
 
 	if (result == null) {
 	    if (logger.isLoggable(Level.FINE)) {

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/ClientPermissionChecker.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/ClientPermissionChecker.java?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/ClientPermissionChecker.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/ClientPermissionChecker.java Fri Jul 11 12:01:53 2014
@@ -94,9 +94,8 @@ public class ClientPermissionChecker imp
 		pd = (ProtectionDomain) domains.get(subject);
 	    }
 	    if (pd == null) {
-		Set s = subject.getPrincipals();
-		Principal[] prins =
-		    (Principal[]) s.toArray(new Principal[s.size()]);
+		Set<Principal> s = subject.getPrincipals();
+		Principal[] prins = s.toArray(new Principal[s.size()]);
 		pd = new ProtectionDomain(emptyCS, null, null, prins);
 		synchronized (domains) {
 		    domains.put(subject, pd);

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/DiscoveryConstraints.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/DiscoveryConstraints.java?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/DiscoveryConstraints.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/DiscoveryConstraints.java Fri Jul 11 12:01:53 2014
@@ -62,7 +62,7 @@ public class DiscoveryConstraints {
 	}
     }
 
-    private static final Set supportedProtocols = new HashSet(2);
+    private static final Set<DiscoveryProtocolVersion> supportedProtocols = new HashSet<DiscoveryProtocolVersion>(2);
     static {
 	supportedProtocols.add(DiscoveryProtocolVersion.ONE);
 	supportedProtocols.add(DiscoveryProtocolVersion.TWO);

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/DiscoveryV1.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/DiscoveryV1.java?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/DiscoveryV1.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/DiscoveryV1.java Fri Jul 11 12:01:53 2014
@@ -103,7 +103,7 @@ class DiscoveryV1 extends Discovery {
 	    groups.add(b);
 	}
 
-	List packets = new ArrayList();
+	List<DatagramPacket> packets = new ArrayList<DatagramPacket>();
 	do {
 	    ByteBuffer buf = ByteBuffer.allocate(maxPacketSize);
 
@@ -150,8 +150,7 @@ class DiscoveryV1 extends Discovery {
 	if (logger.isLoggable(Level.FINEST)) {
 	    logger.log(Level.FINEST, "encoded {0}", new Object[]{ request });
 	}
-	return (DatagramPacket[]) 
-	    packets.toArray(new DatagramPacket[packets.size()]);
+	return packets.toArray(new DatagramPacket[packets.size()]);
     }
 
     public MulticastRequest decodeMulticastRequest(
@@ -252,7 +251,7 @@ class DiscoveryV1 extends Discovery {
 	checkConstraints(constraints);
 
 	// precompute length of UTF-encoded group names
-	LinkedList groups = new LinkedList();
+	LinkedList<byte[]> groups = new LinkedList<byte[]>();
 	byte[] host = Plaintext.toUtf(announcement.getHost());
 	String[] g = announcement.getGroups();
 	for (int i = 0; i < g.length; i++) {
@@ -264,7 +263,7 @@ class DiscoveryV1 extends Discovery {
 	    groups.add(b);
 	}
 
-	List packets = new ArrayList();
+	List<DatagramPacket> packets = new ArrayList<DatagramPacket>();
 	do {
 	    ByteBuffer buf = ByteBuffer.allocate(maxPacketSize);
 

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/kerberos/Client.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/kerberos/Client.java?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/kerberos/Client.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/kerberos/Client.java Fri Jul 11 12:01:53 2014
@@ -88,9 +88,9 @@ public class Client implements UnicastDi
     }
 
     private static final class ClientImpl extends EndpointBasedClient {
-	private static EndpointInternals epi = (EndpointInternals)
-	    AccessController.doPrivileged(new PrivilegedAction() {
-		public Object run() {
+	private static EndpointInternals epi = 
+	    AccessController.doPrivileged(new PrivilegedAction<EndpointInternals>() {
+		public EndpointInternals run() {
 		    return KerberosEndpointInternalsAccess.get();
 		}
 	    });

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/kerberos/Server.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/kerberos/Server.java?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/kerberos/Server.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/kerberos/Server.java Fri Jul 11 12:01:53 2014
@@ -85,9 +85,9 @@ public class Server implements UnicastDi
 
     private static final class ServerImpl extends EndpointBasedServer {
 	
-	private static EndpointInternals epi = (EndpointInternals)
-	    AccessController.doPrivileged(new PrivilegedAction() {
-		public Object run() {
+	private static EndpointInternals epi = 
+	    AccessController.doPrivileged(new PrivilegedAction<EndpointInternals>() {
+		public EndpointInternals run() {
 		    return KerberosEndpointInternalsAccess.get();
 		}
 	    });

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/ssl/Client.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/ssl/Client.java?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/ssl/Client.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/ssl/Client.java Fri Jul 11 12:01:53 2014
@@ -81,9 +81,9 @@ public class Client implements UnicastDi
 
     private static final class ClientImpl extends EndpointBasedClient {
 
-	private static EndpointInternals epi = (EndpointInternals)
-	    AccessController.doPrivileged(new PrivilegedAction() {
-		public Object run() {
+	private static EndpointInternals epi = 
+	    AccessController.doPrivileged(new PrivilegedAction<EndpointInternals>() {
+		public EndpointInternals run() {
 		    return SslEndpointInternalsAccess.get();
 		}
 	    });

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/ssl/Server.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/ssl/Server.java?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/ssl/Server.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/discovery/ssl/Server.java Fri Jul 11 12:01:53 2014
@@ -85,9 +85,9 @@ public class Server implements UnicastDi
 
     private static final class ServerImpl extends EndpointBasedServer {
 	
-	private static EndpointInternals epi = (EndpointInternals)
-	    AccessController.doPrivileged(new PrivilegedAction() {
-		public Object run() {
+	private static EndpointInternals epi =
+	    AccessController.doPrivileged(new PrivilegedAction<EndpointInternals>() {
+		public EndpointInternals run() {
 		    return SslEndpointInternalsAccess.get();
 		}
 	    });

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/CommitJob.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/CommitJob.java?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/CommitJob.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/CommitJob.java Fri Jul 11 12:01:53 2014
@@ -18,7 +18,6 @@
 package com.sun.jini.mahalo;
 
 import com.sun.jini.mahalo.log.ClientLog;
-import com.sun.jini.thread.TaskManager;
 import com.sun.jini.thread.WakeupManager;
 
 import java.rmi.activation.ActivateFailedException;

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/PrepareJob.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/PrepareJob.java?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/PrepareJob.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/PrepareJob.java Fri Jul 11 12:01:53 2014
@@ -19,7 +19,6 @@
 package com.sun.jini.mahalo;
 
 import com.sun.jini.mahalo.log.ClientLog;
-import com.sun.jini.thread.TaskManager;
 import com.sun.jini.thread.WakeupManager;
 import java.rmi.RemoteException;
 import java.util.Iterator;

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/SettlerTask.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/SettlerTask.java?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/SettlerTask.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/SettlerTask.java Fri Jul 11 12:01:53 2014
@@ -19,7 +19,6 @@ package com.sun.jini.mahalo;
 
 import com.sun.jini.logging.Levels;
 import com.sun.jini.thread.RetryTask;
-import com.sun.jini.thread.TaskManager;
 import com.sun.jini.thread.WakeupManager;
 import java.rmi.NoSuchObjectException;
 import java.rmi.RemoteException;

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/TxnManagerImpl.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/TxnManagerImpl.java?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/TxnManagerImpl.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/TxnManagerImpl.java Fri Jul 11 12:01:53 2014
@@ -17,8 +17,6 @@
  */
 package com.sun.jini.mahalo;
 
-import com.sun.jini.config.Config;
-import com.sun.jini.landlord.FixedLeasePeriodPolicy;
 import com.sun.jini.landlord.Landlord;
 import com.sun.jini.landlord.LandlordUtil;
 import com.sun.jini.landlord.LeaseFactory;
@@ -27,7 +25,6 @@ import com.sun.jini.landlord.LeasePeriod
 import com.sun.jini.landlord.LeasePeriodPolicy.Result;
 import com.sun.jini.landlord.LocalLandlord;
 import com.sun.jini.logging.Levels;
-import com.sun.jini.mahalo.log.ClientLog;
 import com.sun.jini.mahalo.log.LogException;
 import com.sun.jini.mahalo.log.LogManager;
 import com.sun.jini.mahalo.log.LogRecord;
@@ -38,17 +35,14 @@ import com.sun.jini.start.LifeCycle;
 import org.apache.river.api.util.Startable;
 import com.sun.jini.thread.InterruptedStatusThread;
 import com.sun.jini.thread.ReadyState;
-import com.sun.jini.thread.TaskManager;
 import com.sun.jini.thread.WakeupManager;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.ObjectStreamException;
 import java.rmi.MarshalledObject;
 import java.rmi.RemoteException;
 import java.rmi.activation.Activatable;
 import java.rmi.activation.ActivationException;
-import java.rmi.activation.ActivationGroup;
 import java.rmi.activation.ActivationID;
 import java.rmi.activation.ActivationSystem;
 import java.security.AccessControlContext;
@@ -57,12 +51,8 @@ import java.security.PrivilegedActionExc
 import java.security.PrivilegedExceptionAction;
 import java.security.SecureRandom;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Queue;
-import java.util.Vector;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ConcurrentMap;
@@ -77,9 +67,7 @@ import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
 
-import net.jini.activation.ActivationExporter;
 import net.jini.config.Configuration;
-import net.jini.config.ConfigurationException;
 import net.jini.config.ConfigurationProvider;
 import net.jini.core.constraint.RemoteMethodControl;
 import net.jini.core.discovery.LookupLocator;
@@ -105,14 +93,8 @@ import net.jini.export.ProxyAccessor;
 import net.jini.id.Uuid;
 import net.jini.id.UuidFactory;
 import net.jini.io.MarshalledInstance;
-import net.jini.jeri.BasicILFactory;
-import net.jini.jeri.BasicJeriExporter;
-import net.jini.jeri.tcp.TcpServerEndpoint;
 import net.jini.lookup.entry.ServiceInfo;
-import net.jini.security.BasicProxyPreparer;
 import net.jini.security.ProxyPreparer;
-import net.jini.security.Security;
-import net.jini.security.SecurityContext;
 import net.jini.security.proxytrust.ServerProxyTrust;
 import net.jini.security.TrustVerifier;
 import org.apache.river.impl.thread.ExtensibleExecutorService;
@@ -419,7 +401,7 @@ class TxnManagerImpl /*extends RemoteSer
         }
         try {
             if (thrown != null) throw thrown;
-            AccessController.doPrivileged(new PrivilegedExceptionAction(){
+            AccessController.doPrivileged(new PrivilegedExceptionAction<Object>(){
 
                 @Override
                 public Object run() throws Exception {

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/TxnManagerImplInitializer.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/TxnManagerImplInitializer.java?rev=1609703&r1=1609702&r2=1609703&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/TxnManagerImplInitializer.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/mahalo/TxnManagerImplInitializer.java Fri Jul 11 12:01:53 2014
@@ -20,11 +20,8 @@ package com.sun.jini.mahalo;
 import com.sun.jini.config.Config;
 import com.sun.jini.constants.TimeConstants;
 import com.sun.jini.landlord.FixedLeasePeriodPolicy;
-import com.sun.jini.landlord.LeaseFactory;
 import com.sun.jini.landlord.LeasePeriodPolicy;
-import com.sun.jini.start.LifeCycle;
 import com.sun.jini.thread.InterruptedStatusThread;
-import com.sun.jini.thread.TaskManager;
 import com.sun.jini.thread.WakeupManager;
 import java.io.IOException;
 import java.rmi.RemoteException;
@@ -34,10 +31,7 @@ import java.rmi.activation.ActivationID;
 import java.rmi.activation.ActivationSystem;
 import java.security.AccessControlContext;
 import java.security.AccessController;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.Iterator;
-import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutorService;



Mime
View raw message