dain 2004/06/03 16:12:54
Modified: modules/deployment/src/test/org/apache/geronimo/deployment
MockGBean.java
modules/kernel/src/java/org/apache/geronimo/gbean/jmx
VMProxyFactory.java
modules/kernel/src/test/org/apache/geronimo/kernel
MockGBean.java
Log:
Removed excessive use of TCL
Revision Changes Path
1.8 +1 -7
incubator-geronimo/modules/deployment/src/test/org/apache/geronimo/deployment/MockGBean.java
Index: MockGBean.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/deployment/src/test/org/apache/geronimo/deployment/MockGBean.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MockGBean.java 2 Jun 2004 05:33:02 -0000 1.7
+++ MockGBean.java 3 Jun 2004 23:12:54 -0000 1.8
@@ -64,11 +64,6 @@
this.endpoint = endpoint;
}
- public boolean checkResource(String name) {
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
- return cl.getResource(name) != null;
- }
-
public String doSomething(String name) {
return name;
}
@@ -89,7 +84,6 @@
infoFactory.addAttribute("Value", String.class, true);
infoFactory.addAttribute("IntValue", int.class, true);
- infoFactory.addOperation("checkResource", new Class[]{String.class});
infoFactory.addOperation("checkEndpoint");
infoFactory.addOperation("doSomething", new Class[]{String.class});
1.2 +3 -7
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/VMProxyFactory.java
Index: VMProxyFactory.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/VMProxyFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VMProxyFactory.java 2 Jun 2004 06:49:23 -0000 1.1
+++ VMProxyFactory.java 3 Jun 2004 23:12:54 -0000 1.2
@@ -16,7 +16,7 @@
*/
package org.apache.geronimo.gbean.jmx;
-import java.lang.reflect.InvocationTargetException;
+
/**
*
@@ -38,11 +38,7 @@
}
public Object create(ProxyMethodInterceptor methodInterceptor) {
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
- if (cl == null) {
- cl = this.getClass().getClassLoader();
- }
- return java.lang.reflect.Proxy.newProxyInstance(cl, new
Class[]{proxyType}, (VMMethodInterceptor)methodInterceptor);
+ return
java.lang.reflect.Proxy.newProxyInstance(proxyType.getClassLoader(), new
Class[]{proxyType}, (VMMethodInterceptor)methodInterceptor);
}
public Object create(ProxyMethodInterceptor methodInterceptor, Class[]
types, Object[] arguments) {
1.18 +1 -7
incubator-geronimo/modules/kernel/src/test/org/apache/geronimo/kernel/MockGBean.java
Index: MockGBean.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/kernel/src/test/org/apache/geronimo/kernel/MockGBean.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- MockGBean.java 2 Jun 2004 20:10:08 -0000 1.17
+++ MockGBean.java 3 Jun 2004 23:12:54 -0000 1.18
@@ -60,7 +60,6 @@
infoFactory.addAttribute("EndpointMutableInt", Integer.TYPE, false);
infoFactory.addOperation("echo", new Class[] {String.class});
- infoFactory.addOperation("checkResource", new Class[] {
String.class});
infoFactory.addOperation("checkEndpoint");
infoFactory.addOperation("checkEndpointCollection");
infoFactory.addOperation("doSomething", new Class[] { String.class});
@@ -236,11 +235,6 @@
public void setEndpointCollection(Collection endpointCollection) {
this.endpointCollection = endpointCollection;
- }
-
- public boolean checkResource(String name) {
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
- return cl.getResource(name) != null;
}
public String doSomething(String name) {