You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2003/08/28 11:09:26 UTC
cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/transport BytesMarshalledObject.java
jdillon 2003/08/28 02:09:26
Modified: modules/core/src/java/org/apache/geronimo/deployment/plan
CreateMBeanInstance.java
InitializeMBeanInstance.java
modules/core/src/java/org/apache/geronimo/remoting/transport
BytesMarshalledObject.java
Removed: modules/core/src/java/org/apache/geronimo/core/util
ClassUtil.java
Log:
o Use o.a.g.c.Classes instead of ClassUtil
Revision Changes Path
1.11 +3 -3 incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/plan/CreateMBeanInstance.java
Index: CreateMBeanInstance.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/plan/CreateMBeanInstance.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CreateMBeanInstance.java 24 Aug 2003 22:40:24 -0000 1.10
+++ CreateMBeanInstance.java 28 Aug 2003 09:09:24 -0000 1.11
@@ -80,8 +80,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.common.StringValueParser;
+import org.apache.geronimo.common.Classes;
-import org.apache.geronimo.core.util.ClassUtil;
import org.apache.geronimo.deployment.DeploymentException;
import org.apache.geronimo.deployment.dependency.DependencyServiceMBean;
import org.apache.geronimo.deployment.service.MBeanDependency;
@@ -278,7 +278,7 @@
Class attrType = null;
try {
- attrType = ClassUtil.getClassForName(cl, typeName);
+ attrType = Classes.loadClass(typeName, cl);
} catch (ClassNotFoundException e) {
throw new DeploymentException(e);
}
1.4 +3 -3 incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/plan/InitializeMBeanInstance.java
Index: InitializeMBeanInstance.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/plan/InitializeMBeanInstance.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InitializeMBeanInstance.java 24 Aug 2003 22:40:24 -0000 1.3
+++ InitializeMBeanInstance.java 28 Aug 2003 09:09:24 -0000 1.4
@@ -73,8 +73,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.common.StringValueParser;
+import org.apache.geronimo.common.Classes;
-import org.apache.geronimo.core.util.ClassUtil;
import org.apache.geronimo.deployment.DeploymentException;
import org.apache.geronimo.deployment.service.MBeanMetadata;
@@ -172,7 +172,7 @@
Class attrType = null;
try {
- attrType = ClassUtil.getClassForName(cl, typeName);
+ attrType = Classes.loadClass(typeName, cl);
} catch (ClassNotFoundException e) {
throw new DeploymentException(e);
}
1.2 +3 -3 incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/transport/BytesMarshalledObject.java
Index: BytesMarshalledObject.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/transport/BytesMarshalledObject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BytesMarshalledObject.java 22 Aug 2003 02:23:26 -0000 1.1
+++ BytesMarshalledObject.java 28 Aug 2003 09:09:25 -0000 1.2
@@ -68,7 +68,7 @@
import java.io.OutputStream;
import java.lang.reflect.Proxy;
-import org.apache.geronimo.core.util.ClassUtil;
+import org.apache.geronimo.common.Classes;
import org.apache.geronimo.remoting.MarshalledObject;
/**
@@ -89,7 +89,7 @@
* @see java.io.ObjectInputStream#resolveClass(java.io.ObjectStreamClass)
*/
protected Class resolveClass(ObjectStreamClass classDesc) throws IOException, ClassNotFoundException {
- return ClassUtil.resolveObjectStreamClass(classloader, classDesc.getName());
+ return Classes.loadClass(classDesc.getName(), classloader);
}
/**