Author: mloenko
Date: Thu Aug 24 00:51:15 2006
New Revision: 434333
URL: http://svn.apache.org/viewvc?rev=434333&view=rev
Log:
applied patch for HARMONY-1251
[classlib][rmi] fix for API violations
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/LoaderHandler.java
incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RMIClassLoader.java
incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RMIClassLoaderSpi.java
incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/Skeleton.java
incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/SkeletonMismatchException.java
incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/SkeletonNotFoundException.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/LoaderHandler.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/LoaderHandler.java?rev=434333&r1=434332&r2=434333&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/LoaderHandler.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/LoaderHandler.java
Thu Aug 24 00:51:15 2006
@@ -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;
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RMIClassLoader.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RMIClassLoader.java?rev=434333&r1=434332&r2=434333&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RMIClassLoader.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RMIClassLoader.java
Thu Aug 24 00:51:15 2006
@@ -60,7 +60,7 @@
*/
private static RMIClassLoaderSpi activeSpi =
(RMIClassLoaderSpi) AccessController.doPrivileged(
- new PrivilegedAction() {
+ new PrivilegedAction<Object>() {
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);
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RMIClassLoaderSpi.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RMIClassLoaderSpi.java?rev=434333&r1=434332&r2=434333&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RMIClassLoaderSpi.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RMIClassLoaderSpi.java
Thu Aug 24 00:51:15 2006
@@ -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
Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/Skeleton.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/Skeleton.java?rev=434333&r1=434332&r2=434333&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/Skeleton.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/Skeleton.java
Thu Aug 24 00:51:15 2006
@@ -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;
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/SkeletonMismatchException.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/SkeletonMismatchException.java?rev=434333&r1=434332&r2=434333&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/SkeletonMismatchException.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/SkeletonMismatchException.java
Thu Aug 24 00:51:15 2006
@@ -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);
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/SkeletonNotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/SkeletonNotFoundException.java?rev=434333&r1=434332&r2=434333&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/SkeletonNotFoundException.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/SkeletonNotFoundException.java
Thu Aug 24 00:51:15 2006
@@ -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);
}
|