river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sijs...@apache.org
Subject svn commit: r1402759 - in /river/jtsk/trunk/src/com/sun/jini: discovery/Discovery.java discovery/UnicastDiscoveryClient.java norm/NormServerBaseImpl.java outrigger/EntryRep.java phoenix/ActivationGroupImpl.java phoenix/ActivationGroupInit.java
Date Sat, 27 Oct 2012 08:23:25 GMT
Author: sijskes
Date: Sat Oct 27 08:23:25 2012
New Revision: 1402759

URL: http://svn.apache.org/viewvc?rev=1402759&view=rev
Log:
RIVER-336

Modified:
    river/jtsk/trunk/src/com/sun/jini/discovery/Discovery.java
    river/jtsk/trunk/src/com/sun/jini/discovery/UnicastDiscoveryClient.java
    river/jtsk/trunk/src/com/sun/jini/norm/NormServerBaseImpl.java
    river/jtsk/trunk/src/com/sun/jini/outrigger/EntryRep.java
    river/jtsk/trunk/src/com/sun/jini/phoenix/ActivationGroupImpl.java
    river/jtsk/trunk/src/com/sun/jini/phoenix/ActivationGroupInit.java

Modified: river/jtsk/trunk/src/com/sun/jini/discovery/Discovery.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src/com/sun/jini/discovery/Discovery.java?rev=1402759&r1=1402758&r2=1402759&view=diff
==============================================================================
--- river/jtsk/trunk/src/com/sun/jini/discovery/Discovery.java (original)
+++ river/jtsk/trunk/src/com/sun/jini/discovery/Discovery.java Sat Oct 27 08:23:25 2012
@@ -364,7 +364,7 @@ public abstract class Discovery {
      * <code>null</code>
      * @param defaultLoader the class loader value (possibly <code>null</code>)
      * to be passed as the <code>defaultLoader</code> argument to
-     * <code>RMIClassLoader</code> methods when unmarshalling the registrar
+     * <code>RiverClassLoader</code> methods when unmarshalling the registrar
      * proxy
      * @param verifierLoader the class loader value (possibly
      * <code>null</code>) to pass to {@link

Modified: river/jtsk/trunk/src/com/sun/jini/discovery/UnicastDiscoveryClient.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src/com/sun/jini/discovery/UnicastDiscoveryClient.java?rev=1402759&r1=1402758&r2=1402759&view=diff
==============================================================================
--- river/jtsk/trunk/src/com/sun/jini/discovery/UnicastDiscoveryClient.java (original)
+++ river/jtsk/trunk/src/com/sun/jini/discovery/UnicastDiscoveryClient.java Sat Oct 27 08:23:25
2012
@@ -63,7 +63,7 @@ public interface UnicastDiscoveryClient 
      * <code>null</code>
      * @param defaultLoader the class loader value (possibly <code>null</code>)
      * to be passed as the <code>defaultLoader</code> argument to
-     * <code>RMIClassLoader</code> methods when unmarshalling the registrar
+     * <code>RiverClassLoader</code> methods when unmarshalling the registrar
      * proxy
      * @param verifierLoader the class loader value (possibly
      * <code>null</code>) to pass to {@link

Modified: river/jtsk/trunk/src/com/sun/jini/norm/NormServerBaseImpl.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src/com/sun/jini/norm/NormServerBaseImpl.java?rev=1402759&r1=1402758&r2=1402759&view=diff
==============================================================================
--- river/jtsk/trunk/src/com/sun/jini/norm/NormServerBaseImpl.java (original)
+++ river/jtsk/trunk/src/com/sun/jini/norm/NormServerBaseImpl.java Sat Oct 27 08:23:25 2012
@@ -26,7 +26,6 @@ import java.io.OutputStream;
 import java.rmi.MarshalledObject;
 import java.rmi.NoSuchObjectException;
 import java.rmi.RemoteException;
-import java.rmi.server.RMIClassLoader;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.Collection;
@@ -88,7 +87,6 @@ import com.sun.jini.landlord.LandlordUti
 import com.sun.jini.landlord.LeaseFactory;
 import com.sun.jini.landlord.LeasePeriodPolicy;
 import com.sun.jini.landlord.LocalLandlord;
-import com.sun.jini.logging.Levels;
 import com.sun.jini.lookup.entry.BasicServiceType;
 import com.sun.jini.norm.event.EventType;
 import com.sun.jini.norm.event.EventTypeGenerator;
@@ -99,6 +97,7 @@ import com.sun.jini.start.LifeCycle;
 import com.sun.jini.reliableLog.LogException;
 import com.sun.jini.reliableLog.LogHandler;
 import com.sun.jini.thread.InterruptedStatusThread;
+import net.jini.loader.RiverClassLoader;
 
 /**
  * Base class for implementations of NormServer.  Provides a complete
@@ -297,7 +296,7 @@ abstract class NormServerBaseImpl
 		       "Adding lease of class {0} with annotation {1}",
 		       new Object[] {
 			   leaseToRenew.getClass(),
-			   RMIClassLoader.getClassAnnotation(lc) });
+			   RiverClassLoader.getClassAnnotation(lc) });
 	}
 
 	// Add the lease to the set

Modified: river/jtsk/trunk/src/com/sun/jini/outrigger/EntryRep.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src/com/sun/jini/outrigger/EntryRep.java?rev=1402759&r1=1402758&r2=1402759&view=diff
==============================================================================
--- river/jtsk/trunk/src/com/sun/jini/outrigger/EntryRep.java (original)
+++ river/jtsk/trunk/src/com/sun/jini/outrigger/EntryRep.java Sat Oct 27 08:23:25 2012
@@ -34,7 +34,6 @@ import java.lang.reflect.Modifier;
 import java.net.MalformedURLException;
 import java.rmi.MarshalException;
 import java.rmi.UnmarshalException;
-import java.rmi.server.RMIClassLoader;
 import java.security.DigestOutputStream;
 import java.security.MessageDigest;
 import java.util.ArrayList;
@@ -49,6 +48,7 @@ import net.jini.id.Uuid;
 import net.jini.id.UuidFactory;
 import net.jini.io.MarshalledInstance;
 import net.jini.loader.ClassLoading;
+import net.jini.loader.RiverClassLoader;
 import net.jini.space.JavaSpace;
 
 /**
@@ -234,7 +234,7 @@ class EntryRep implements StorableResour
 	if (validate)
 	    ensureValidClass(realClass);
 	className = realClass.getName();
-	codebase = RMIClassLoader.getClassAnnotation(realClass);
+	codebase = RiverClassLoader.getClassAnnotation(realClass);
 
 	/*
 	 * Build up the per-field and superclass information through

Modified: river/jtsk/trunk/src/com/sun/jini/phoenix/ActivationGroupImpl.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src/com/sun/jini/phoenix/ActivationGroupImpl.java?rev=1402759&r1=1402758&r2=1402759&view=diff
==============================================================================
--- river/jtsk/trunk/src/com/sun/jini/phoenix/ActivationGroupImpl.java (original)
+++ river/jtsk/trunk/src/com/sun/jini/phoenix/ActivationGroupImpl.java Sat Oct 27 08:23:25
2012
@@ -41,7 +41,6 @@ import java.rmi.activation.ActivationMon
 import java.rmi.activation.ActivationSystem;
 import java.rmi.activation.UnknownObjectException;
 import java.rmi.server.ExportException;
-import java.rmi.server.RMIClassLoader;
 import java.rmi.server.RemoteObject;
 import java.rmi.server.UnicastRemoteObject;
 import java.security.AccessController;
@@ -64,6 +63,7 @@ import net.jini.export.Exporter;
 import net.jini.export.ProxyAccessor;
 import net.jini.jeri.BasicJeriExporter;
 import net.jini.jeri.tcp.TcpServerEndpoint;
+import net.jini.loader.RiverClassLoader;
 import net.jini.security.BasicProxyPreparer;
 import net.jini.security.ProxyPreparer;
 import net.jini.security.Security;
@@ -626,7 +626,7 @@ public class ActivationGroupImpl extends
      * <p>Otherwise:
      *
      * <p>The class for the object is loaded by invoking {@link
-     * RMIClassLoader#loadClass(String,String) RMIClassLoader.loadClass}
+     * RiverClassLoader#loadClass(String,String) RiverClassLoader.loadClass}
      * passing the class location (obtained by invoking {@link
      * ActivationDesc#getLocation getLocation} on the activation
      * descriptor) and the class name (obtained by invoking {@link
@@ -702,7 +702,7 @@ public class ActivationGroupImpl extends
 	    }
 
 	    String className = desc.getClassName();
-	    final Class cl = RMIClassLoader.loadClass(desc.getLocation(),
+	    final Class cl = RiverClassLoader.loadClass(desc.getLocation(),
 						      className);
 	    final Thread t = Thread.currentThread();
 	    final ClassLoader savedCcl = t.getContextClassLoader();

Modified: river/jtsk/trunk/src/com/sun/jini/phoenix/ActivationGroupInit.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src/com/sun/jini/phoenix/ActivationGroupInit.java?rev=1402759&r1=1402758&r2=1402759&view=diff
==============================================================================
--- river/jtsk/trunk/src/com/sun/jini/phoenix/ActivationGroupInit.java (original)
+++ river/jtsk/trunk/src/com/sun/jini/phoenix/ActivationGroupInit.java Sat Oct 27 08:23:25
2012
@@ -22,9 +22,9 @@ import java.lang.reflect.Method;
 import java.rmi.activation.ActivationGroup;
 import java.rmi.activation.ActivationGroupDesc;
 import java.rmi.activation.ActivationGroupID;
-import java.rmi.server.RMIClassLoader;
 import java.util.Collections;
 import net.jini.io.MarshalInputStream;
+import net.jini.loader.RiverClassLoader;
 
 /**
  * This is the bootstrap code to start a virtual machine (VM) executing an
@@ -70,7 +70,7 @@ class ActivationGroupInit {
 	    ActivationGroupID id  = (ActivationGroupID)in.readObject();
 	    ActivationGroupDesc desc = (ActivationGroupDesc)in.readObject();
 	    long incarnation = in.readLong();
-	    Class cl = RMIClassLoader.loadClass(desc.getLocation(),
+	    Class cl = RiverClassLoader.loadClass(desc.getLocation(),
 						desc.getClassName());
 	    try {
 		Method create =



Mime
View raw message