dain 2005/05/08 15:37:11
Modified: modules/core/src/test/org/openejb/slsb MockEJBContainer.java
MockEJBContainerGBean.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.8 +9 -9
openejb/modules/core/src/test/org/openejb/slsb/MockEJBContainer.java
Index: MockEJBContainer.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/test/org/openejb/slsb/MockEJBContainer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MockEJBContainer.java 18 Mar 2005 07:42:22 -0000 1.7
+++ MockEJBContainer.java 8 May 2005 19:37:11 -0000 1.8
@@ -115,23 +115,23 @@
return null;
}
- public String getEJBName() {
+ public String getEjbName() {
return null;
}
- public EJBHome getEJBHome() {
+ public EJBHome getEjbHome() {
return null;
}
- public EJBObject getEJBObject(Object primaryKey) {
+ public EJBObject getEjbObject(Object primaryKey) {
return null;
}
- public EJBLocalHome getEJBLocalHome() {
+ public EJBLocalHome getEjbLocalHome() {
return null;
}
- public EJBLocalObject getEJBLocalObject(Object primaryKey) {
+ public EJBLocalObject getEjbLocalObject(Object primaryKey) {
return null;
}
@@ -197,12 +197,12 @@
static {
GBeanInfoBuilder infoFactory = new
GBeanInfoBuilder(MockEJBContainer.class);
- infoFactory.addAttribute("EJBName", String.class, true);
+ infoFactory.addAttribute("ejbName", String.class, true);
infoFactory.addAttribute("ProxyInfo", ProxyInfo.class, true);
infoFactory.addOperation("getMethodIndex", new Class[]
{Method.class});
- infoFactory.addOperation("getEJBObject", new Class[] {Object.class});
- infoFactory.addOperation("getEJBLocalObject", new Class[]
{Object.class});
+ infoFactory.addOperation("getEjbObject", new Class[] {Object.class});
+ infoFactory.addOperation("getEjbLocalObject", new Class[]
{Object.class});
infoFactory.addOperation("invoke", new Class[]{Invocation.class});
infoFactory.addOperation("invoke", new Class[]{Method.class,
Object[].class, Object.class});
1.4 +8 -6
openejb/modules/core/src/test/org/openejb/slsb/MockEJBContainerGBean.java
Index: MockEJBContainerGBean.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/test/org/openejb/slsb/MockEJBContainerGBean.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MockEJBContainerGBean.java 18 Mar 2005 17:10:39 -0000 1.3
+++ MockEJBContainerGBean.java 8 May 2005 19:37:11 -0000 1.4
@@ -44,16 +44,18 @@
*/
package org.openejb.slsb;
-import java.net.URL;
import java.lang.reflect.Method;
+import java.net.URL;
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.core.service.Invocation;
+import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
import org.apache.geronimo.kernel.GBeanNotFoundException;
-import org.apache.geronimo.core.service.Invocation;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.jmx.JMXUtil;
import org.openejb.proxy.ProxyInfo;
public class MockEJBContainerGBean {