Index: main/java/java/rmi/server/LoaderHandler.java =================================================================== --- main/java/java/rmi/server/LoaderHandler.java (revision 433353) +++ main/java/java/rmi/server/LoaderHandler.java (working copy) @@ -30,28 +30,35 @@ * * @author Mikhail A. Markov * @version $Revision: 1.3.4.2 $ + * @deprecated This interface was being used by previous versions of RMI. + * It should not be used anymore. There is no replacement. */ +@Deprecated public interface LoaderHandler { /** * @com.intel.drl.spec_ref */ + @Deprecated public static final String packagePrefix = "org.apache.harmony.rmi"; /** * @com.intel.drl.spec_ref */ + @Deprecated public Object getSecurityContext(ClassLoader loader); /** * @com.intel.drl.spec_ref */ - public Class loadClass(URL codebase, String name) + @Deprecated + public Class loadClass(URL codebase, String name) throws MalformedURLException, ClassNotFoundException; /** * @com.intel.drl.spec_ref */ - public Class loadClass(String name) + @Deprecated + public Class loadClass(String name) throws MalformedURLException, ClassNotFoundException; } Index: main/java/java/rmi/server/RMIClassLoader.java =================================================================== --- main/java/java/rmi/server/RMIClassLoader.java (revision 433353) +++ main/java/java/rmi/server/RMIClassLoader.java (working copy) @@ -60,7 +60,7 @@ */ private static RMIClassLoaderSpi activeSpi = (RMIClassLoaderSpi) AccessController.doPrivileged( - new PrivilegedAction() { + new PrivilegedAction() { public Object run() { return initActiveSpi(); } @@ -73,7 +73,7 @@ /** * @com.intel.drl.spec_ref */ - public static Class loadProxyClass(String codebase, + public static Class loadProxyClass(String codebase, String[] interf, ClassLoader defaultCl) throws ClassNotFoundException, MalformedURLException { @@ -83,7 +83,7 @@ /** * @com.intel.drl.spec_ref */ - public static Class loadClass(String codebase, + public static Class loadClass(String codebase, String name, ClassLoader defaultCl) throws MalformedURLException, ClassNotFoundException { @@ -93,7 +93,7 @@ /** * @com.intel.drl.spec_ref */ - public static Class loadClass(URL codebase, String name) + public static Class loadClass(URL codebase, String name) throws MalformedURLException, ClassNotFoundException { return activeSpi.loadClass((codebase == null) ? null : codebase.toString(), name, null); @@ -102,7 +102,7 @@ /** * @com.intel.drl.spec_ref */ - public static Class loadClass(String codebase, String name) + public static Class loadClass(String codebase, String name) throws MalformedURLException, ClassNotFoundException { return activeSpi.loadClass(codebase, name, null); } @@ -110,14 +110,17 @@ /** * @com.intel.drl.spec_ref */ - public static String getClassAnnotation(Class cl) { + public static String getClassAnnotation(Class cl) { return activeSpi.getClassAnnotation(cl); } /** * @com.intel.drl.spec_ref * It's depricated so we just return null. + * @deprecated since Java v1.2 this method is no longer used by RMI + * framework */ + @Deprecated public static Object getSecurityContext(ClassLoader loader) { return null; } @@ -132,8 +135,10 @@ /** * @com.intel.drl.spec_ref + * @deprecated method loadClass(String, String) should be used instead */ - public static Class loadClass(String name) + @Deprecated + public static Class loadClass(String name) throws MalformedURLException, ClassNotFoundException { return loadClass((String) null, name); } Index: main/java/java/rmi/server/RMIClassLoaderSpi.java =================================================================== --- main/java/java/rmi/server/RMIClassLoaderSpi.java (revision 433353) +++ main/java/java/rmi/server/RMIClassLoaderSpi.java (working copy) @@ -41,7 +41,7 @@ /** * @com.intel.drl.spec_ref */ - public abstract Class loadProxyClass(String codebase, + public abstract Class loadProxyClass(String codebase, String[] interf, ClassLoader defaultCl) throws MalformedURLException, ClassNotFoundException; @@ -49,7 +49,7 @@ /** * @com.intel.drl.spec_ref */ - public abstract Class loadClass(String codebase, + public abstract Class loadClass(String codebase, String name, ClassLoader defaultCl) throws MalformedURLException, ClassNotFoundException; @@ -57,7 +57,7 @@ /** * @com.intel.drl.spec_ref */ - public abstract String getClassAnnotation(Class cl); + public abstract String getClassAnnotation(Class cl); /** * @com.intel.drl.spec_ref Index: main/java/java/rmi/server/Skeleton.java =================================================================== --- main/java/java/rmi/server/Skeleton.java (revision 433353) +++ main/java/java/rmi/server/Skeleton.java (working copy) @@ -29,17 +29,21 @@ * * @author Mikhail A. Markov * @version $Revision: 1.3.4.2 $ + * @deprecated Skeletons are not used by RMI framework since Java v1.2 */ +@Deprecated public interface Skeleton { /** * @com.intel.drl.spec_ref */ + @Deprecated public Operation[] getOperations(); /** * @com.intel.drl.spec_ref */ + @Deprecated public void dispatch(Remote impl, RemoteCall call, int opnum, long hash) throws Exception; } Index: main/java/java/rmi/server/SkeletonMismatchException.java =================================================================== --- main/java/java/rmi/server/SkeletonMismatchException.java (revision 433353) +++ main/java/java/rmi/server/SkeletonMismatchException.java (working copy) @@ -29,7 +29,9 @@ * * @author Mikhail A. Markov * @version $Revision: 1.4.4.2 $ + * @deprecated Skeletons are not used by RMI framework since Java v1.2 */ +@Deprecated public class SkeletonMismatchException extends RemoteException { private static final long serialVersionUID = -7780460454818859281L; @@ -37,6 +39,7 @@ /** * @com.intel.drl.spec_ref */ + @Deprecated public SkeletonMismatchException(String msg) { super(msg); } Index: main/java/java/rmi/server/SkeletonNotFoundException.java =================================================================== --- main/java/java/rmi/server/SkeletonNotFoundException.java (revision 433353) +++ main/java/java/rmi/server/SkeletonNotFoundException.java (working copy) @@ -29,7 +29,9 @@ * * @author Mikhail A. Markov * @version $Revision: 1.4.4.2 $ + * @deprecated Skeletons are not used by RMI framework since Java v1.2 */ +@Deprecated public class SkeletonNotFoundException extends RemoteException { private static final long serialVersionUID = -7860299673822761231L; @@ -37,6 +39,7 @@ /** * @com.intel.drl.spec_ref */ + @Deprecated public SkeletonNotFoundException(String msg, Exception cause) { super(msg, cause); } @@ -44,6 +47,7 @@ /** * @com.intel.drl.spec_ref */ + @Deprecated public SkeletonNotFoundException(String msg) { super(msg); }