river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peter_firmst...@apache.org
Subject svn commit: r1596790 - in /river/jtsk/skunk/qa_refactor/trunk: dep-libs/reggie-test-nameservice-provider/ qa/src/com/sun/jini/qa/harness/ qa/src/com/sun/jini/test/impl/joinmanager/ qa/src/com/sun/jini/test/impl/reggie/ qa/src/com/sun/jini/test/impl/sta...
Date Thu, 22 May 2014 09:29:35 GMT
Author: peter_firmstone
Date: Thu May 22 09:29:34 2014
New Revision: 1596790

URL: http://svn.apache.org/r1596790
Log:
RIVER-439 Removed dependencies on Sun JVM specific internal implementation classes.

Added:
    river/jtsk/skunk/qa_refactor/trunk/dep-libs/reggie-test-nameservice-provider/
    river/jtsk/skunk/qa_refactor/trunk/dep-libs/reggie-test-nameservice-provider/ReggieTestNameServiceProvider-1.0-sources.jar   (with props)
    river/jtsk/skunk/qa_refactor/trunk/dep-libs/reggie-test-nameservice-provider/ReggieTestNameServiceProvider-1.0.jar   (with props)
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/SkipNonSunJDKTestVerifier.java
      - copied, changed from r1593905, river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/SkipPostJDK14TestVerifier.java
Removed:
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reggie/NameServiceDescriptorImpl.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reggie/NameServiceImpl.java
Modified:
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reggie/MultihomedClientTest.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reggie/MultihomedClientTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationGroupDescriptorTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationGroupDescriptorTest2.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionActionsTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionCollectionTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionEqualsTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionHTTPEqualsTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionHTTPImpliesTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionImpliesTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/CheckTrustEquivalence_Test.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/CheckTrustEquivalence_UntrustedAIDTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Constructor_AccessorTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/GetActivationID_CallTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/GetCurrentProxy_CallTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_MethodsNoActivationTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_MethodsWithActivationTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_ObjectMethodsTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_WithExceptionNoActivationTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_WithExceptionWithActivationTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Constructor_AccessorTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Export_CallTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Export_ExceptionTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Unexport_CallTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Unexport_ExceptionTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/Constructor_AccessorTest.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/Constructor_AccessorTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/CreateGroup_ExceptionTest.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/CreateGroup_Test.td
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/Inactivate_Test.td
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/action/GetIntegerAction.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/RegistrySunExporter.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/SunJrmpExporter.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/SharedGroupBackEnd.java
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/thread/ThreadPool.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/activation/ActivationExporter.java
    river/jtsk/skunk/qa_refactor/trunk/src/net/jini/loader/ClassLoading.java

Added: river/jtsk/skunk/qa_refactor/trunk/dep-libs/reggie-test-nameservice-provider/ReggieTestNameServiceProvider-1.0-sources.jar
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/dep-libs/reggie-test-nameservice-provider/ReggieTestNameServiceProvider-1.0-sources.jar?rev=1596790&view=auto
==============================================================================
Binary file - no diff available.

Propchange: river/jtsk/skunk/qa_refactor/trunk/dep-libs/reggie-test-nameservice-provider/ReggieTestNameServiceProvider-1.0-sources.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: river/jtsk/skunk/qa_refactor/trunk/dep-libs/reggie-test-nameservice-provider/ReggieTestNameServiceProvider-1.0.jar
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/dep-libs/reggie-test-nameservice-provider/ReggieTestNameServiceProvider-1.0.jar?rev=1596790&view=auto
==============================================================================
Binary file - no diff available.

Propchange: river/jtsk/skunk/qa_refactor/trunk/dep-libs/reggie-test-nameservice-provider/ReggieTestNameServiceProvider-1.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Copied: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/SkipNonSunJDKTestVerifier.java (from r1593905, river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/SkipPostJDK14TestVerifier.java)
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/SkipNonSunJDKTestVerifier.java?p2=river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/SkipNonSunJDKTestVerifier.java&p1=river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/SkipPostJDK14TestVerifier.java&r1=1593905&r2=1596790&rev=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/SkipPostJDK14TestVerifier.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/SkipNonSunJDKTestVerifier.java Thu May 22 09:29:34 2014
@@ -22,9 +22,9 @@ import java.util.logging.Level;
 
 /**
  * A configuration verifier used by tests which should not be run
- * on a JDK after JDK 1.4.*. Used to temporarily disable a test.
+ * on a non Sun JDK. Used to temporarily disable a test.
  */
-public class SkipPostJDK14TestVerifier implements ConfigurationVerifier {
+public class SkipNonSunJDKTestVerifier implements ConfigurationVerifier {
 
     private static Logger logger = 
 	Logger.getLogger("com.sun.jini.qa.harness");
@@ -40,13 +40,14 @@ public class SkipPostJDK14TestVerifier i
      */
     public boolean canRun(TestDescription td, QAConfig config) {
 	try {
-	    Class.forName("java.rmi.server.RemoteObjectInvocationHandler");
+	    Class.forName("sun.rmi.server.UnicastServerRef");
+            Class.forName("sun.net.spi.nameservice.NameService");
 	} catch (ClassNotFoundException cnfe) {
-	    return true;
-        }
-	logger.log(Level.INFO, 
-            "ATTENTION: SkipPostJDK14TestVerifier configured to skip " 
+            logger.log(Level.INFO, 
+            "ATTENTION: SkipNonSunJDKTestVerifier configured to skip " 
             + td.getName());
-        return false;
+	    return false;
+        }
+        return true;
     }
 }

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=LeaseRenewDurRFE
 testCategories=joinmanager,joinmanager_impl
 

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reggie/MultihomedClientTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reggie/MultihomedClientTest.java?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reggie/MultihomedClientTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reggie/MultihomedClientTest.java Thu May 22 09:29:34 2014
@@ -60,8 +60,11 @@ public class MultihomedClientTest implem
     private void appendProperties(StringBuffer buffer) {
         buffer.append("-cp ").append(
             config.getStringConfigVal("testClasspath",""))
-                .append(File.pathSeparator).append(
-                config.getStringConfigVal("metaInf","")).append(" ");
+                .append(File.pathSeparator)
+                .append(config.getStringConfigVal("metaInf",""))
+                .append(File.pathSeparator)
+                .append(config.getStringConfigVal("metaInf2", ""))
+                .append(" ");
         buffer.append("-Djava.security.manager= ");
         buffer.append("-Djava.security.policy=").append(
             config.getStringConfigVal("policy","")).append(" ");

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reggie/MultihomedClientTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reggie/MultihomedClientTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reggie/MultihomedClientTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reggie/MultihomedClientTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,6 @@
+# Name service provider has been moved to an external
+# library to allow compilation on platforms other than Sun JVM.
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=MultihomedClientTest
 testCategories=lookupservice,lookupservice_impl
 testPolicyfile=<url: harness/policy/policy.all>
@@ -12,6 +15,7 @@ startConfig=<url:com/sun/jini/test/impl/
 lookupConfig=<url:com/sun/jini/test/impl/reggie/resources/lookupdiscovery.config>
 #logging=<file:tests/logging/multihomedClientTestLogging.properties>
 logging=${java.util.logging.config.file}
-metaInf=<file: lib/qa1-multihomedmetainf.jar>
+metaInf=<file:lib/qa1-multihomedmetainf.jar>
+metaInf2=<file:../dep-libs/reggie-test-nameservice-provider/ReggieTestNameServiceProvider-1.0.jar>
 timeout=10
 

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationGroupDescriptorTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationGroupDescriptorTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationGroupDescriptorTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationGroupDescriptorTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=SharedActivationGroupDescriptorTest
 testCategories=start,start_impl
 include0=start.properties

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationGroupDescriptorTest2.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationGroupDescriptorTest2.java?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationGroupDescriptorTest2.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationGroupDescriptorTest2.java Thu May 22 09:29:34 2014
@@ -17,19 +17,19 @@
  */
 package com.sun.jini.test.impl.start;
 
+import com.sun.jini.action.GetIntegerAction;
 import com.sun.jini.qa.harness.Test;
-import java.util.logging.Level;
-
 import com.sun.jini.qa.harness.TestException;
 import com.sun.jini.start.SharedActivationGroupDescriptor;
-import net.jini.config.ConfigurationException;
-
 import java.lang.reflect.Constructor;
 import java.rmi.activation.ActivationSystem;
 import java.util.Arrays;
 import java.util.Properties;
+import java.util.logging.Level;
+import net.jini.config.ConfigurationException;
+
+
 
-import sun.security.action.GetIntegerAction;
 
 
 public class SharedActivationGroupDescriptorTest2 extends StarterBase implements Test {
@@ -152,15 +152,15 @@ public class SharedActivationGroupDescri
     static boolean checkPort(int src, int dest) {
        int desired = 
 	   (src <= 0) ? 
-	       ((Integer)java.security.AccessController.doPrivileged(
-		   new GetIntegerAction("java.rmi.activation.port", 
-		   ActivationSystem.SYSTEM_PORT))).intValue()
+               (java.security.AccessController.doPrivileged(
+                       new GetIntegerAction("java.rmi.activation.port",
+                               ActivationSystem.SYSTEM_PORT))).intValue()
                : src;	
         return (desired == dest);
     }
     static boolean checkHost(String src, String dest) {
 	String desired = (src == null) ? "" : src;
-        return (desired == dest);
+        return (desired.equals(dest));
     }
 
     private static boolean checkOptions(String[] src, String[] dest) {

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionActionsTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionActionsTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionActionsTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionActionsTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=SharedActivationPolicyPermissionActionsTest
 testCategories=start,start_impl
 include0=start.properties

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionCollectionTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionCollectionTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionCollectionTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionCollectionTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=SharedActivationPolicyPermissionCollectionTest
 testCategories=start,start_impl
 include0=start.properties

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionEqualsTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionEqualsTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionEqualsTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionEqualsTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=SharedActivationPolicyPermissionEqualsTest
 testCategories=start,start_impl
 include0=start.properties

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionHTTPEqualsTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionHTTPEqualsTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionHTTPEqualsTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionHTTPEqualsTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=SharedActivationPolicyPermissionHTTPEqualsTest
 testCategories=start,start_impl
 include0=start.properties

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionHTTPImpliesTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionHTTPImpliesTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionHTTPImpliesTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionHTTPImpliesTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=SharedActivationPolicyPermissionHTTPImpliesTest
 testCategories=start,start_impl
 include0=start.properties

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionImpliesTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionImpliesTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionImpliesTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionImpliesTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=SharedActivationPolicyPermissionImpliesTest
 testCategories=start,start_impl
 include0=start.properties

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/CheckTrustEquivalence_Test.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/CheckTrustEquivalence_Test.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/CheckTrustEquivalence_Test.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/CheckTrustEquivalence_Test.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=CheckTrustEquivalence_Test
 testCategories=activation,activation_spec
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/CheckTrustEquivalence_UntrustedAIDTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/CheckTrustEquivalence_UntrustedAIDTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/CheckTrustEquivalence_UntrustedAIDTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/CheckTrustEquivalence_UntrustedAIDTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=CheckTrustEquivalence_UntrustedAIDTest
 testCategories=activation,activation_spec
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Constructor_AccessorTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Constructor_AccessorTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Constructor_AccessorTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Constructor_AccessorTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=Constructor_AccessorTest
 testCategories=activation,activation_spec
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/GetActivationID_CallTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/GetActivationID_CallTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/GetActivationID_CallTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/GetActivationID_CallTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=GetActivationID_CallTest
 testCategories=activation,activation_spec
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/GetCurrentProxy_CallTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/GetCurrentProxy_CallTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/GetCurrentProxy_CallTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/GetCurrentProxy_CallTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=GetCurrentProxy_CallTest
 testCategories=activation,activation_spec
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_MethodsNoActivationTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_MethodsNoActivationTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_MethodsNoActivationTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_MethodsNoActivationTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=Invoke_MethodsNoActivationTest
 testCategories=activation,activation_spec
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_MethodsWithActivationTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_MethodsWithActivationTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_MethodsWithActivationTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_MethodsWithActivationTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=Invoke_MethodsWithActivationTest
 testCategories=activation,activation_spec
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_ObjectMethodsTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_ObjectMethodsTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_ObjectMethodsTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_ObjectMethodsTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=Invoke_ObjectMethodsTest
 testCategories=activation,activation_spec
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_WithExceptionNoActivationTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_WithExceptionNoActivationTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_WithExceptionNoActivationTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_WithExceptionNoActivationTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=Invoke_WithExceptionNoActivationTest
 testCategories=activation,activation_spec
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_WithExceptionWithActivationTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_WithExceptionWithActivationTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_WithExceptionWithActivationTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activatableinvocationhandler/Invoke_WithExceptionWithActivationTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=Invoke_WithExceptionWithActivationTest
 testCategories=activation,activation_spec
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Constructor_AccessorTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Constructor_AccessorTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Constructor_AccessorTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Constructor_AccessorTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=Constructor_AccessorTest
 testCategories=activation,activation_spec
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Export_CallTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Export_CallTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Export_CallTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Export_CallTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=Export_CallTest
 testCategories=activation,activation_spec
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Export_ExceptionTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Export_ExceptionTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Export_ExceptionTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Export_ExceptionTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=Export_ExceptionTest
 testCategories=activation,activation_spec
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Unexport_CallTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Unexport_CallTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Unexport_CallTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Unexport_CallTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=Unexport_CallTest
 testCategories=activation,activation_spec
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Unexport_ExceptionTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Unexport_ExceptionTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Unexport_ExceptionTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationexporter/Unexport_ExceptionTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=Unexport_ExceptionTest
 testCategories=activation,activation_spec
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/Constructor_AccessorTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/Constructor_AccessorTest.java?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/Constructor_AccessorTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/Constructor_AccessorTest.java Thu May 22 09:29:34 2014
@@ -17,17 +17,12 @@
  */
 package com.sun.jini.test.spec.activation.activationgroup;
 
-import java.util.logging.Level;
 import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.Test;
-import com.sun.jini.qa.harness.TestException;
 import com.sun.jini.test.spec.activation.util.FakeActivationGroup;
-import java.util.logging.Logger;
 import java.util.logging.Level;
 import java.rmi.activation.ActivationGroupID;
-import java.rmi.RemoteException;
 import java.rmi.server.RemoteRef;
-import sun.rmi.server.UnicastServerRef;
 /**
  * <pre>
  * Purpose:
@@ -66,7 +61,8 @@ public class Constructor_AccessorTest ex
         fag = new FakeActivationGroup(aid);
         RemoteRef ref = fag.getRef();
         logger.log(Level.FINEST, "ActivationGroup.ref = " + ref);
-        assertion(ref instanceof UnicastServerRef,
+        Class unicastServerRefClass = Class.forName("sun.rmi.server.UnicastServerRef");
+        assertion(unicastServerRefClass.isInstance(ref),
                 "ActivationGroup should be exported as"
                 + " UnicastRemoteObject");
     }

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/Constructor_AccessorTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/Constructor_AccessorTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/Constructor_AccessorTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/Constructor_AccessorTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=Constructor_AccessorTest
 testCategories=activation,activation_spec
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/CreateGroup_ExceptionTest.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/CreateGroup_ExceptionTest.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/CreateGroup_ExceptionTest.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/CreateGroup_ExceptionTest.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=CreateGroup_ExceptionTest
 testCategories=activation,activation_spec
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/CreateGroup_Test.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/CreateGroup_Test.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/CreateGroup_Test.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/CreateGroup_Test.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=CreateGroup_Test
 testCategories=activation,activation_spec
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/Inactivate_Test.td
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/Inactivate_Test.td?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/Inactivate_Test.td (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/activation/activationgroup/Inactivate_Test.td Thu May 22 09:29:34 2014
@@ -1,3 +1,4 @@
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipNonSunJDKTestVerifier
 testClass=Inactivate_Test
 testCategories=activation,activation_spec
 com.sun.jini.qa.harness.runjiniserver=false

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/action/GetIntegerAction.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/action/GetIntegerAction.java?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/action/GetIntegerAction.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/action/GetIntegerAction.java Thu May 22 09:29:34 2014
@@ -71,7 +71,7 @@ import net.jini.security.Security;
  * @see		Security
  * @since 2.0
  **/
-public class GetIntegerAction implements PrivilegedAction {
+public class GetIntegerAction implements PrivilegedAction<Integer> {
 
     private static final Logger logger =
 	Logger.getLogger("com.sun.jini.action.GetIntegerAction");
@@ -122,7 +122,7 @@ public class GetIntegerAction implements
      * @return	an <code>Integer</code> representing the value of the
      * system property or the default value, or <code>null</code>
      **/
-    public Object run() {
+    public Integer run() {
 	try {
 	    Integer value = Integer.getInteger(theProp);
 	    if (value != null) {

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/RegistrySunExporter.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/RegistrySunExporter.java?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/RegistrySunExporter.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/RegistrySunExporter.java Thu May 22 09:29:34 2014
@@ -18,21 +18,12 @@
 
 package com.sun.jini.phoenix;
 
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.rmi.Remote;
 import java.rmi.activation.ActivationSystem;
 import java.rmi.server.ObjID;
-import java.rmi.server.RemoteCall;
-import sun.rmi.server.MarshalInputStream;
-import sun.rmi.server.UnicastServerRef;
-import sun.rmi.transport.LiveRef;
 
 /**
  * JRMP exporter to export a <code>Registry</code> using the well-known
- * registry object identifier, and preventing remote code downloading for
- * incoming remote calls. This exporter implementation is only designed to
+ * registry object identifier. This exporter implementation is only designed to
  * work with Java(TM) 2 Standard Edition implementations from Sun
  * Microsystems(TM), Inc.
  *
@@ -57,65 +48,74 @@ public class RegistrySunExporter extends
     public RegistrySunExporter(int port) {
 	super(ObjID.REGISTRY_ID, port);
     }
-
-    UnicastServerRef getServerRef(LiveRef lref) {
-	return new BootstrapServerRef(lref);
-    }
+    
+    /* JRMP exporter to export a <code>Registry</code> using the well-known
+     * registry object identifier and preventing remote code downloading for 
+     * incoming remote calls.
+     * 
+     * UnicastServerRef now uses dynamic stubs by default, there shouldn't
+     * be any code downloads required.
+    */
+
+//    @Override
+//    RemoteRef getServerRef(Object lref) {
+//	return new BootstrapServerRef(lref);
+//    }
 
     /**
      * Server-side ref to prevent remote code downloading when unmarshalling
      * arguments.
      */
-    static class BootstrapServerRef extends UnicastServerRef {
-	private static final long serialVersionUID = 3007040253722540025L;
-	private static Method useCodebaseOnly;
-
-	static {
-	    try {
-		useCodebaseOnly =
-		    MarshalInputStream.class.getDeclaredMethod(
-					     "useCodebaseOnly", null);
-	    } catch (NoSuchMethodException e) {
-		throw new InternalError("XXX");
-	    }
-	    useCodebaseOnly.setAccessible(true);
-	}
-
-	/**
-	 * Construct an instance with the given live ref.
-	 */
-	public BootstrapServerRef(LiveRef lref) {
-	    super(lref);
-	}
-
-	/**
-	 * Disable remote code downloading on the input stream and then
-	 * continue normal dispatching.
-         * 
-         * From the RemoteCall javadoc:
-         * RemoteCall is an abstraction used solely by the RMI runtime 
-         * (in conjunction with stubs and skeletons of remote objects) 
-         * to carry out a call to a remote object. The RemoteCall interface 
-         * is deprecated because it is only used by deprecated methods of 
-         * java.rmi.server.RemoteRef.
-         * 
-         * This method is an overridden method from UnicastServerRef which is
-         * a sun internal implementation class.
-         * 
-         * @deprecated no replacement
-         * @see java.rmi.server.RemoteCall
-	 */
-	@Deprecated
-	@Override
-	public void dispatch(Remote obj, RemoteCall call) throws IOException {
-	    try {
-		useCodebaseOnly.invoke(call.getInputStream(), new Object[0]);
-	    } catch (IllegalAccessException e) {
-		throw new InternalError("XXX");
-	    } catch (InvocationTargetException e) {
-		throw (Error) e.getTargetException();
-	    }
-	    super.dispatch(obj, call);
-	}
-    }
+//    static class BootstrapServerRef extends UnicastServerRef {
+//	private static final long serialVersionUID = 3007040253722540025L;
+//	private static Method useCodebaseOnly;
+//
+//	static {
+//	    try {
+//		useCodebaseOnly =
+//		    MarshalInputStream.class.getDeclaredMethod(
+//					     "useCodebaseOnly", null);
+//	    } catch (NoSuchMethodException e) {
+//		throw new InternalError("XXX");
+//	    }
+//	    useCodebaseOnly.setAccessible(true);
+//	}
+//
+//	/**
+//	 * Construct an instance with the given live ref.
+//	 */
+//	public BootstrapServerRef(LiveRef lref) {
+//	    super(lref);
+//	}
+//
+//	/**
+//	 * Disable remote code downloading on the input stream and then
+//	 * continue normal dispatching.
+//         * 
+//         * From the RemoteCall javadoc:
+//         * RemoteCall is an abstraction used solely by the RMI runtime 
+//         * (in conjunction with stubs and skeletons of remote objects) 
+//         * to carry out a call to a remote object. The RemoteCall interface 
+//         * is deprecated because it is only used by deprecated methods of 
+//         * java.rmi.server.RemoteRef.
+//         * 
+//         * This method is an overridden method from UnicastServerRef which is
+//         * a sun internal implementation class.
+//         * 
+//         * @deprecated no replacement
+//         * @see java.rmi.server.RemoteCall
+//	 */
+//	@Deprecated
+//	@Override
+//	public void dispatch(Remote obj, RemoteCall call) throws IOException {
+//	    try {
+//		useCodebaseOnly.invoke(call.getInputStream(), new Object[0]);
+//	    } catch (IllegalAccessException e) {
+//		throw new InternalError("XXX");
+//	    } catch (InvocationTargetException e) {
+//		throw (Error) e.getTargetException();
+//	    }
+//	    super.dispatch(obj, call);
+//	}
+//    }
 }

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/SunJrmpExporter.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/SunJrmpExporter.java?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/SunJrmpExporter.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/SunJrmpExporter.java Thu May 22 09:29:34 2014
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.sun.jini.phoenix;
 
 import java.lang.ref.WeakReference;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.rmi.NoSuchObjectException;
@@ -28,19 +28,18 @@ import java.rmi.server.ExportException;
 import java.rmi.server.ObjID;
 import java.rmi.server.UnicastRemoteObject;
 import net.jini.export.Exporter;
-import sun.rmi.server.UnicastServerRef;
-import sun.rmi.transport.LiveRef;
 
 /**
- * JRMP exporter to export an object using a well-known object identifier.
- * This exporter implementation is only designed to work with
- * Java(TM) 2 Standard Edition implementations from Sun Microsystems(TM), Inc.
+ * JRMP exporter to export an object using a well-known object identifier. This
+ * exporter implementation is only designed to work with Java(TM) 2 Standard
+ * Edition implementations from Sun Microsystems(TM), Inc.
  *
  * @author Sun Microsystems, Inc.
- * 
+ *
  * @since 2.0
  */
 public class SunJrmpExporter implements Exporter {
+
     /**
      * The object identifier.
      */
@@ -55,16 +54,28 @@ public class SunJrmpExporter implements 
     private WeakReference ref;
 
     private static final Method exportMethod;
+    private static final Constructor unicastServerRefConstructor;
+    private static final Constructor liveRefConstructor;
 
     static {
-	try {
-	    Class[] paramTypes =
-		new Class[] { Remote.class, Object.class, boolean.class };
-	    exportMethod = UnicastServerRef.class.getMethod("exportObject",
-							    paramTypes);
-	} catch (NoSuchMethodException nsme) {
-	    throw (Error) new NoSuchMethodError().initCause(nsme);
-	}
+        try {
+            Class unicastServerRefClass = Class.forName("sun.rmi.server.UnicastServerRef");
+            Class liveRefClass = Class.forName("sun.rmi.transport.LiveRef");
+            Class[] paramTypes
+                    = new Class[]{Remote.class, Object.class, boolean.class};
+            exportMethod = unicastServerRefClass.getMethod("exportObject",
+                    paramTypes);
+            paramTypes = new Class[]{liveRefClass};
+            unicastServerRefConstructor = unicastServerRefClass.getConstructor(paramTypes);
+            unicastServerRefConstructor.setAccessible(true);
+            paramTypes = new Class[]{ObjID.class, int.class};
+            liveRefConstructor = liveRefClass.getConstructor(paramTypes);
+            liveRefConstructor.setAccessible(true);
+        } catch (NoSuchMethodException nsme) {
+            throw (Error) new NoSuchMethodError().initCause(nsme);
+        } catch (ClassNotFoundException ex) {
+            throw (Error) new NoSuchMethodError().initCause(ex);
+        }
     }
 
     /**
@@ -75,63 +86,73 @@ public class SunJrmpExporter implements 
      * @param port the port (if zero, an anonymous port will be chosen)
      */
     public SunJrmpExporter(int id, int port) {
-	this.id = id;
-	this.port = port;
+        this.id = id;
+        this.port = port;
     }
 
     /**
+     * @throws java.rmi.server.ExportException
      * @throws NullPointerException {@inheritDoc}
      * @throws IllegalStateException {@inheritDoc}
      */
+    @Override
     public Remote export(Remote impl) throws ExportException {
-	if (ref != null) {
-	    throw new IllegalStateException("already used for export");
-	} else if (impl == null) {
-	    throw new NullPointerException();
-	}
-	ref = new WeakReference(impl);
-	UnicastServerRef uref = getServerRef(new LiveRef(new ObjID(id), port));
-	try {
-	    Object[] args = new Object[] { impl, null, Boolean.TRUE };
-	    return (Remote) exportMethod.invoke(uref, args);
-	} catch (InvocationTargetException e) {
-	    Throwable t = e.getTargetException();
-	    if (t instanceof ExportException) {
-		throw (ExportException) t;
-	    } else if (t instanceof RemoteException) {
-		throw new ExportException("export failed", (Exception) t);
-	    } else if (t instanceof RuntimeException) {
-		throw (RuntimeException) t;
-	    } else if (t instanceof Error) {
-		throw (Error) t;
-	    } else {
-		throw new AssertionError(t);
-	    }
-	} catch (IllegalAccessException e) {
-	    throw (Error) new IllegalAccessError().initCause(e);
-	}
+        if (ref != null) {
+            throw new IllegalStateException("already used for export");
+        } else if (impl == null) {
+            throw new NullPointerException();
+        }
+        ref = new WeakReference(impl);
+
+        try {
+            Object[] args = new Object[]{new ObjID(id), port};
+            Object uref = getServerRef(liveRefConstructor.newInstance(args));
+            args = new Object[]{impl, null, Boolean.TRUE};
+            return (Remote) exportMethod.invoke(uref, args);
+        } catch (InvocationTargetException e) {
+            Throwable t = e.getTargetException();
+            if (t instanceof ExportException) {
+                throw (ExportException) t;
+            } else if (t instanceof RemoteException) {
+                throw new ExportException("export failed", (Exception) t);
+            } else if (t instanceof RuntimeException) {
+                throw (RuntimeException) t;
+            } else if (t instanceof Error) {
+                throw (Error) t;
+            } else {
+                throw new AssertionError(t);
+            }
+        } catch (IllegalAccessException e) {
+            throw (Error) new IllegalAccessError().initCause(e);
+        } catch (InstantiationException ex) {
+            throw new AssertionError(ex);
+        } catch (IllegalArgumentException ex) {
+            throw new AssertionError(ex);
+        }
     }
 
-    UnicastServerRef getServerRef(LiveRef lref) {
-	return new UnicastServerRef(lref);
+    Object getServerRef(Object lref) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
+        Object[] args = new Object[]{lref};
+        return unicastServerRefConstructor.newInstance(args);
     }
 
     /**
      * @throws IllegalStateException {@inheritDoc}
      */
+    @Override
     public boolean unexport(boolean force) {
-	if (ref == null) {
-	    throw new IllegalStateException(
-				 "no object exported through this exporter");
-	}
-	Remote impl = (Remote) ref.get();
-	if (impl == null) {
-	    return true;
-	}
-	try {
-	    return UnicastRemoteObject.unexportObject(impl, force);
-	} catch (NoSuchObjectException ex) {
-	    return true;
-	}
+        if (ref == null) {
+            throw new IllegalStateException(
+                    "no object exported through this exporter");
+        }
+        Remote impl = (Remote) ref.get();
+        if (impl == null) {
+            return true;
+        }
+        try {
+            return UnicastRemoteObject.unexportObject(impl, force);
+        } catch (NoSuchObjectException ex) {
+            return true;
+        }
     }
 }

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/SharedGroupBackEnd.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/SharedGroupBackEnd.java?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/SharedGroupBackEnd.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/start/SharedGroupBackEnd.java Thu May 22 09:29:34 2014
@@ -31,7 +31,7 @@ import java.rmi.Remote;
  * @since 1.2
  */
 //@see com.sun.jini.start.SharedGroupAdmin
-interface SharedGroupBackEnd extends SharedGroup, Remote
+public interface SharedGroupBackEnd extends SharedGroup, Remote
 {
     // No additional methods
 }

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/thread/ThreadPool.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/thread/ThreadPool.java?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/thread/ThreadPool.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/thread/ThreadPool.java Thu May 22 09:29:34 2014
@@ -137,11 +137,12 @@ final class ThreadPool implements Execut
 //         Thread not started until after constructor completes
 //         this escaping occurs safely.
         Runtime.getRuntime().addShutdownHook(new Thread ("ThreadPool destroy"){
+            @Override
             public void run (){
                 try {
-                    // Allow three seconds prior to shutdown for other
+                    // Allow four seconds prior to shutdown for other
                     // processes to complete.
-                    Thread.sleep(3000L);
+                    Thread.sleep(4000L);
                 } catch (InterruptedException ex) {
                     Thread.currentThread().interrupt();
                 }
@@ -156,6 +157,7 @@ final class ThreadPool implements Execut
     }
 
     // This method must not block - Executor
+    @Override
     public void execute(Runnable runnable, String name) {
         if (runnable == null) return;
         if (shutdown) throw new RejectedExecutionException("ThreadPool shutdown");
@@ -200,6 +202,7 @@ final class ThreadPool implements Execut
 	    this.name = name;
 	}
         
+        @Override
         public void run(){
             try {
                 runnable.run();
@@ -220,6 +223,7 @@ final class ThreadPool implements Execut
             }
         }
 
+        @Override
         public String toString(){
             return name;
         }
@@ -237,6 +241,7 @@ final class ThreadPool implements Execut
 	    this.first = first;
 	}
 
+        @Override
 	public void run() {
             workerCount.incrementAndGet();
             try {

Modified: river/jtsk/skunk/qa_refactor/trunk/src/net/jini/activation/ActivationExporter.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/net/jini/activation/ActivationExporter.java?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/net/jini/activation/ActivationExporter.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/net/jini/activation/ActivationExporter.java Thu May 22 09:29:34 2014
@@ -267,14 +267,13 @@ public final class ActivationExporter im
 	Class[] interfaces = cl.getInterfaces();
 	for (int i = 0; i < interfaces.length; i++) {
 	    Class intf = interfaces[i];
-	    
 	    /*
 	     * Complain if the underlying proxy has a non-public class and
 	     * implements non-public interfaces.
 	     */
 	    if (checkPublic && !Modifier.isPublic(intf.getModifiers())) {
 		throw new ExportException(
-		    "proxy implements non-public interface");
+		    "proxy implements non-public interface" + intf.getName());
 	    }
 	    
 	    /*

Modified: river/jtsk/skunk/qa_refactor/trunk/src/net/jini/loader/ClassLoading.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/net/jini/loader/ClassLoading.java?rev=1596790&r1=1596789&r2=1596790&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/net/jini/loader/ClassLoading.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/net/jini/loader/ClassLoading.java Thu May 22 09:29:34 2014
@@ -136,23 +136,25 @@ public final class ClassLoading {
                    = ServiceLoader.load(RMIClassLoaderSpi.class, providerLoader);
                 Iterator<RMIClassLoaderSpi> iter = loader.iterator();
                 RMIClassLoaderSpi spi;
-                while ( iter.hasNext() ) {
-                    try {
-                        spi = iter.next();
-                        if (spi != null) {
-                            if (!name.equals(spi.getClass().getName()))
-                                continue;
-                            logger.log(Level.CONFIG, "loaded: {0}", name);
-                            return spi;
+                try {
+                    while ( iter.hasNext() ) {
+                        try {
+                            spi = iter.next();
+                            if (spi != null) {
+                                if (!name.equals(spi.getClass().getName()))
+                                    continue;
+                                logger.log(Level.CONFIG, "loaded: {0}", name);
+                                return spi;
+                            }
+                        } catch (Throwable e) {
+                            logger.log( 
+                                    Level.CONFIG, 
+                                    "error loading RMIClassLoaderSpi: {0}",
+                                    new Object[]{e}
+                            );
                         }
-                    } catch (Exception e) {
-                        logger.log( 
-                                Level.CONFIG, 
-                                "error loading RMIClassLoaderSpi: {0}",
-                                new Object[]{e}
-                        );
                     }
-                }
+                } catch (Throwable t) { }
                 logger.log(Level.CONFIG, "uable to find {0}" , name);
                 return null;
             }



Mime
View raw message