Author: peter_firmstone Date: Fri May 23 01:59:48 2014 New Revision: 1597001
URL: http://svn.apache.org/r1597001 Log: RIVER-439 Removed dependencies on Sun JVM specific internal implementation classes, enabling building on Java 1.6 IBM J9 Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.java river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/Activation.java river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/ActivationGroupInit.java river/jtsk/skunk/qa_refactor/trunk/src/net/jini/activation/ActivationExporter.java Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.java?rev=1597001&r1=1597000&r2=1597001&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.java (original) +++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.java Fri May 23 01:59:48 2014 @@ -1133,7 +1133,7 @@ public class LeaseRenewDurRFE extends Ab public void exitService() throws RemoteException, ActivationException; }//end interface TestServiceInterface - static interface RemoteTestServiceInterface extends Remote, + public static interface RemoteTestServiceInterface extends Remote, ServiceProxyAccessor { public void exitService() throws RemoteException, ActivationException; Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/Activation.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/Activation.java?rev=1597001&r1=1597000&r2=1597001&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/Activation.java (original) +++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/Activation.java Fri May 23 01:59:48 2014 @@ -93,6 +93,7 @@ import net.jini.security.BasicProxyPrepa import net.jini.security.ProxyPreparer; import net.jini.security.TrustVerifier; import net.jini.security.proxytrust.ServerProxyTrust; +import org.apache.river.api.security.CombinerSecurityManager; /** * Phoenix main class. @@ -1846,7 +1847,7 @@ class Activation implements Serializable */ public static void main(String[] args) { if (System.getSecurityManager() == null) { - System.setSecurityManager(new SecurityManager()); + System.setSecurityManager(new CombinerSecurityManager()); } boolean stop = false; if (args.length > 0 && args[0].equals("-stop")) { Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/ActivationGroupInit.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/ActivationGroupInit.java?rev=1597001&r1=1597000&r2=1597001&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/ActivationGroupInit.java (original) +++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/ActivationGroupInit.java Fri May 23 01:59:48 2014 @@ -26,6 +26,7 @@ import java.rmi.server.RMIClassLoader; import java.util.Collections; import net.jini.io.MarshalInputStream; import net.jini.loader.ClassLoading; +import org.apache.river.api.security.CombinerSecurityManager; /** * This is the bootstrap code to start a virtual machine (VM) executing an @@ -60,7 +61,7 @@ class ActivationGroupInit { { try { if (System.getSecurityManager() == null) { - System.setSecurityManager(new SecurityManager()); + System.setSecurityManager(new CombinerSecurityManager()); } MarshalInputStream in = new MarshalInputStream( 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=1597001&r1=1597000&r2=1597001&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 Fri May 23 01:59:48 2014 @@ -273,7 +273,7 @@ public final class ActivationExporter im */ if (checkPublic && !Modifier.isPublic(intf.getModifiers())) { throw new ExportException( - "proxy implements non-public interface" + intf.getName()); + "proxy implements non-public interface " + intf.getName()); } /*
