Diff
Modified: branches/v2_1/openejb2/modules/core/src/java/org/openejb/EJBModuleImpl.java (2611 => 2612)
--- branches/v2_1/openejb2/modules/core/src/java/org/openejb/EJBModuleImpl.java 2006-04-19 06:50:56 UTC (rev 2611)
+++ branches/v2_1/openejb2/modules/core/src/java/org/openejb/EJBModuleImpl.java 2006-04-19 06:52:22 UTC (rev 2612)
@@ -59,8 +59,7 @@
import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.j2ee.management.impl.InvalidObjectNameException;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.jmx.JMXUtil;
+import org.apache.geronimo.kernel.ObjectNameUtil;
import org.apache.geronimo.management.EJB;
import org.apache.geronimo.management.EJBModule;
import org.apache.geronimo.management.J2EEApplication;
@@ -86,7 +85,7 @@
public EJBModuleImpl(String objectName, J2EEServer server, J2EEApplication application, String deploymentDescriptor, ConnectionFactoryDelegate delegate, ConnectionFactorySource connectionFactory, TransactionManagerDelegate tmDelegate, TransactionContextManager transactionContextManager, Collection ejbs) {
this.objectName = objectName;
- ObjectName myObjectName = JMXUtil.getObjectName(objectName);
+ ObjectName myObjectName = ObjectNameUtil.getObjectName(objectName);
verifyObjectName(myObjectName);
this.server = server;
Modified: branches/v2_1/openejb2/modules/core/src/java/org/openejb/mejb/MEJB.java (2611 => 2612)
--- branches/v2_1/openejb2/modules/core/src/java/org/openejb/mejb/MEJB.java 2006-04-19 06:50:56 UTC (rev 2611)
+++ branches/v2_1/openejb2/modules/core/src/java/org/openejb/mejb/MEJB.java 2006-04-19 06:52:22 UTC (rev 2612)
@@ -61,6 +61,7 @@
import javax.ejb.Handle;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
+import javax.management.MBeanServer;
import javax.management.j2ee.Management;
import javax.management.j2ee.ManagementHome;
import javax.security.auth.Subject;
@@ -71,7 +72,7 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.system.jmx.MBeanServerReference;
import org.openejb.EJBComponentType;
import org.openejb.EJBContainer;
import org.openejb.EJBInvocation;
@@ -96,8 +97,13 @@
private final FastClass fastClass;
private final String ejbName;
- public MEJB(String objectName, Kernel kernel) {
- super(objectName, kernel);
+ // todo remove this as soon as Geronimo supports factory beans
+ public MEJB(String objectName, MBeanServerReference mbeanServerReference) {
+ this(objectName, mbeanServerReference.getMBeanServer());
+ }
+
+ public MEJB(String objectName, MBeanServer mbeanServer) {
+ super(objectName, mbeanServer);
this.objectName = objectName;
String ejbName;
try {
@@ -227,7 +233,7 @@
return ejbInvocation.createResult(fastClass.invoke(methodIndex, this, ejbInvocation.getArguments()));
} catch (InvocationTargetException ite) {
Throwable t = ite.getTargetException();
- if (t instanceof Exception && t instanceof RuntimeException == false) {
+ if (t instanceof Exception && !(t instanceof RuntimeException)) {
// checked exception - which we simply include in the result
return ejbInvocation.createExceptionResult((Exception)t);
} else {
@@ -240,9 +246,9 @@
static {
GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(MEJB.class, org.apache.geronimo.j2ee.mejb.MEJB.GBEAN_INFO, NameFactory.STATELESS_SESSION_BEAN);
- infoBuilder.addInterface(EJBContainer.class);
+ infoBuilder.addReference("MBeanServerReference", MBeanServerReference.class);
- infoBuilder.setConstructor(new String[]{"objectName", "kernel"});
+ infoBuilder.setConstructor(new String[]{"objectName", "MBeanServerReference"});
GBEAN_INFO = infoBuilder.getBeanInfo();
}
Modified: branches/v2_1/openejb2/modules/core/src/java/org/openejb/server/ServiceManager.java (2611 => 2612)
--- branches/v2_1/openejb2/modules/core/src/java/org/openejb/server/ServiceManager.java 2006-04-19 06:50:56 UTC (rev 2611)
+++ branches/v2_1/openejb2/modules/core/src/java/org/openejb/server/ServiceManager.java 2006-04-19 06:52:22 UTC (rev 2612)
@@ -49,7 +49,6 @@
import java.util.HashMap;
import java.util.Properties;
import java.util.Vector;
-import javax.management.ObjectName;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -57,7 +56,6 @@
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.kernel.KernelRegistry;
import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.jmx.JMXUtil;
import org.openejb.util.Messages;
import org.activeio.xnet.ServerService;
import org.activeio.xnet.ServiceException;
Modified: branches/v2_1/openejb2/modules/core/src/test/org/openejb/slsb/MockEJBContainer.java (2611 => 2612)
--- branches/v2_1/openejb2/modules/core/src/test/org/openejb/slsb/MockEJBContainer.java 2006-04-19 06:50:56 UTC (rev 2611)
+++ branches/v2_1/openejb2/modules/core/src/test/org/openejb/slsb/MockEJBContainer.java 2006-04-19 06:52:22 UTC (rev 2612)
@@ -52,19 +52,13 @@
import javax.ejb.EJBLocalHome;
import javax.ejb.EJBLocalObject;
import javax.ejb.EJBObject;
-import javax.management.ObjectName;
import javax.security.auth.Subject;
import org.apache.geronimo.core.service.Invocation;
import org.apache.geronimo.core.service.InvocationResult;
import org.apache.geronimo.core.service.SimpleInvocationResult;
-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.kernel.Kernel;
-import org.apache.geronimo.kernel.jmx.JMXUtil;
import org.openejb.EJBComponentType;
import org.openejb.EJBContainer;
import org.openejb.dispatch.InterfaceMethodSignature;
Modified: branches/v2_1/openejb2/modules/core/src/test/org/openejb/slsb/MockEJBContainerGBean.java (2611 => 2612)
--- branches/v2_1/openejb2/modules/core/src/test/org/openejb/slsb/MockEJBContainerGBean.java 2006-04-19 06:50:56 UTC (rev 2611)
+++ branches/v2_1/openejb2/modules/core/src/test/org/openejb/slsb/MockEJBContainerGBean.java 2006-04-19 06:52:22 UTC (rev 2612)
@@ -46,16 +46,10 @@
import java.lang.reflect.Method;
import java.net.URL;
-import javax.management.ObjectName;
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.kernel.Kernel;
-import org.apache.geronimo.kernel.jmx.JMXUtil;
import org.openejb.proxy.ProxyInfo;
public class MockEJBContainerGBean {
Modified: branches/v2_1/openejb2/modules/core/src/test/org/openejb/timer/TimerServiceImplTest.java (2611 => 2612)
--- branches/v2_1/openejb2/modules/core/src/test/org/openejb/timer/TimerServiceImplTest.java 2006-04-19 06:50:56 UTC (rev 2611)
+++ branches/v2_1/openejb2/modules/core/src/test/org/openejb/timer/TimerServiceImplTest.java 2006-04-19 06:52:22 UTC (rev 2612)
@@ -59,7 +59,7 @@
import org.apache.geronimo.core.service.Interceptor;
import org.apache.geronimo.core.service.Invocation;
import org.apache.geronimo.core.service.InvocationResult;
-import org.apache.geronimo.kernel.jmx.JMXUtil;
+import org.apache.geronimo.kernel.ObjectNameUtil;
import org.apache.geronimo.pool.ThreadPool;
import org.apache.geronimo.timer.ExecutorTaskFactory;
import org.apache.geronimo.timer.ThreadPooledTimer;
@@ -70,15 +70,9 @@
import org.apache.geronimo.transaction.context.TransactionContextManager;
import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
import org.apache.geronimo.transaction.manager.XidFactoryImpl;
-import org.apache.geronimo.core.service.InvocationResult;
-import org.apache.geronimo.core.service.Invocation;
import org.openejb.EJBInterfaceType;
import org.openejb.EJBInvocation;
import org.openejb.EJBInvocationImpl;
-import org.openejb.dispatch.VirtualOperation;
-import org.openejb.dispatch.InterfaceMethodSignature;
-import org.openejb.security.PermissionManager;
-import org.openejb.transaction.TransactionPolicyManager;
/**
*
@@ -93,7 +87,7 @@
private static final String key = "testThreadPooledTimer";
private static final String kernelName = "testKernel";
- private static final ObjectName timerSourceName = JMXUtil.getObjectName("test:type=TimerService");
+ private static final ObjectName timerSourceName = ObjectNameUtil.getObjectName("test:type=TimerService");
private final ClassLoader classLoader = this.getClass().getClassLoader();
private ThreadPool threadPool;
private ThreadPooledTimer threadPooledTimer;
@@ -110,7 +104,7 @@
private Serializable userKey = "test user info";
protected void setUp() throws Exception {
- TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000,
+ TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000,
new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
transactionContextManager = new TransactionContextManager(transactionManager, transactionManager);
executableWorkFactory = new TransactionalExecutorTaskFactory(transactionContextManager, 1);
