dain 2005/05/08 15:37:06
Modified: modules/core/src/java/org/openejb/server/ejbd
EjbServerGBean.java JndiRequestHandler.java
Log:
Added KernelFactory for pluggable kernel
Kernel is now an interface
Moved Kernel implementation to basic kernel
Converted JMX registry and config manager to plain old gbeans (they do not
require special access to the kernel)
Magic attributes such as state and enabled are now accessed via kernel methods
Use of getAttribute and invoke for magic attributes and state transition is
now deprecated
Cleaned up cruft in GBean infos such as declaration of non existent attributes
Upgraded to newest CGLIB, asm, and commons-collections
Revision Changes Path
1.4 +7 -5
openejb/modules/core/src/java/org/openejb/server/ejbd/EjbServerGBean.java
Index: EjbServerGBean.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/server/ejbd/EjbServerGBean.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EjbServerGBean.java 23 Mar 2005 08:23:24 -0000 1.3
+++ EjbServerGBean.java 8 May 2005 19:37:06 -0000 1.4
@@ -46,12 +46,14 @@
import javax.management.ObjectName;
-import org.apache.geronimo.gbean.*;
-import org.apache.geronimo.kernel.jmx.JMXUtil;
-import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
import org.apache.geronimo.kernel.GBeanNotFoundException;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.jmx.JMXUtil;
import org.openejb.ContainerIndex;
import org.openejb.corba.ORBRef;
import org.openejb.server.SocketService;
1.11 +9 -5
openejb/modules/core/src/java/org/openejb/server/ejbd/JndiRequestHandler.java
Index: JndiRequestHandler.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/server/ejbd/JndiRequestHandler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JndiRequestHandler.java 29 Sep 2004 19:36:00 -0000 1.10
+++ JndiRequestHandler.java 8 May 2005 19:37:06 -0000 1.11
@@ -52,10 +52,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.KernelRegistry;
import org.openejb.ContainerIndex;
import org.openejb.EJBContainer;
-import org.openejb.client.*;
+import org.openejb.client.EJBMetaDataImpl;
+import org.openejb.client.JNDIRequest;
+import org.openejb.client.JNDIResponse;
+import org.openejb.client.RequestMethods;
+import org.openejb.client.ResponseCodes;
import org.openejb.proxy.ProxyInfo;
/**
@@ -91,7 +95,7 @@
contextClassLoader = thread.getContextClassLoader();
try {
ObjectName objectName = new
ObjectName(req.getClientModuleID());
- ClassLoader classLoader =
(ClassLoader)Kernel.getSingleKernel().getAttribute(objectName, "classLoader");
+ ClassLoader classLoader =
(ClassLoader)KernelRegistry.getSingleKernel().getAttribute(objectName,
"classLoader");
thread.setContextClassLoader(classLoader);
} catch (Throwable e) {
replyWithFatalError(out, e, "Failed to set the correct
classloader");
@@ -148,7 +152,7 @@
if (req.getClientModuleID() != null) {
try {
ObjectName objectName = new
ObjectName(req.getClientModuleID());
- Object context =
Kernel.getSingleKernel().getAttribute(objectName, "componentContext");
+ Object context =
KernelRegistry.getSingleKernel().getAttribute(objectName, "componentContext");
res.setResponseCode(JNDI_CONTEXT_TREE);
res.setResult(context);
