djencks 2004/07/14 23:34:21
Modified: modules/core/src/test/org/openejb/mdb/mockra
DeploymentHelper.java MockEndpointWorker.java
Log:
attribute/reference name case fixes
Revision Changes Path
1.3 +15 -7
openejb/modules/core/src/test/org/openejb/mdb/mockra/DeploymentHelper.java
Index: DeploymentHelper.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/test/org/openejb/mdb/mockra/DeploymentHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DeploymentHelper.java 6 Jul 2004 17:22:49 -0000 1.2
+++ DeploymentHelper.java 15 Jul 2004 03:34:21 -0000 1.3
@@ -58,6 +58,7 @@
import org.apache.geronimo.connector.ResourceAdapterWrapper;
import org.apache.geronimo.connector.ActivationSpecInfo;
import org.apache.geronimo.connector.ActivationSpecWrapper;
+import org.apache.geronimo.connector.work.GeronimoWorkManager;
/**
*
@@ -66,14 +67,21 @@
*
* */
public class DeploymentHelper {
+ private static final String j2eeDomainName = "openejb.server";
+ private static final String j2eeServerName = "TestOpenEJBServer";
public static final ObjectName CONTAINER_NAME =
JMXUtil.getObjectName("geronimo.test:ejb=Mock");
- public static final ObjectName BOOTSTRAPCONTEXT_NAME =
JMXUtil.getObjectName("geronimo.server:j2eeType=BootStrapContext");
+ public static final ObjectName TRANSACTIONMANAGER_NAME =
JMXUtil.getObjectName(j2eeDomainName + ":type=TransactionManager");
+ public static final ObjectName WORKMANAGER_NAME =
JMXUtil.getObjectName("geronimo.server:type=WorkManager,name=DefaultWorkManager");
public static final ObjectName RESOURCE_ADAPTER_NAME =
JMXUtil.getObjectName("openejb.server:j2eeType=ResourceAdapter,J2EEServer=TestOpenEJBServer,name=MockRA");
public static final ObjectName ACTIVATIONSPEC_NAME =
JMXUtil.getObjectName("geronimo.server:j2eeType=ActivationSpec,name=MockMDB");
public static void setUpResourceAdapter(Kernel kernel) throws Exception {
- GBeanMBean bootstrapContextGBean = new
GBeanMBean(MockBootstrapContext.getGBeanInfo());
- start(kernel, BOOTSTRAPCONTEXT_NAME, bootstrapContextGBean);
+ GBeanMBean geronimoWorkManagerGBean = new
GBeanMBean(GeronimoWorkManager.getGBeanInfo());
+ geronimoWorkManagerGBean.setAttribute("syncMaximumPoolSize", new
Integer(5));
+ geronimoWorkManagerGBean.setAttribute("startMaximumPoolSize", new
Integer(5));
+ geronimoWorkManagerGBean.setAttribute("scheduledMaximumPoolSize", new
Integer(5));
+ geronimoWorkManagerGBean.setReferencePattern("XAServices",
TRANSACTIONMANAGER_NAME);
+ start(kernel, WORKMANAGER_NAME, geronimoWorkManagerGBean);
GBeanMBean resourceAdapterGBean = new
GBeanMBean(ResourceAdapterWrapper.getGBeanInfo());
Map activationSpecInfoMap = new HashMap();
@@ -81,13 +89,13 @@
activationSpecInfoMap.put(MockActivationSpec.class.getName(),
activationSpecInfo);
resourceAdapterGBean.setAttribute("resourceAdapterClass",
MockResourceAdapter.class);
resourceAdapterGBean.setAttribute("activationSpecInfoMap",
activationSpecInfoMap);
- resourceAdapterGBean.setReferencePattern("bootstrapContext",
BOOTSTRAPCONTEXT_NAME);
+ resourceAdapterGBean.setReferencePattern("WorkManager", WORKMANAGER_NAME);
start(kernel, RESOURCE_ADAPTER_NAME, resourceAdapterGBean);
GBeanMBean activationSpecGBean = new
GBeanMBean(ActivationSpecWrapper.getGBeanInfo());
activationSpecGBean.setAttribute("activationSpecClass",
MockActivationSpec.class);
activationSpecGBean.setAttribute("containerId",
CONTAINER_NAME.getCanonicalName());
- activationSpecGBean.setReferencePattern("resourceAdapterWrapper",
RESOURCE_ADAPTER_NAME);
+ activationSpecGBean.setReferencePattern("ResourceAdapterWrapper",
RESOURCE_ADAPTER_NAME);
start(kernel, ACTIVATIONSPEC_NAME, activationSpecGBean);
}
@@ -99,7 +107,7 @@
public static void tearDownAdapter(Kernel kernel) throws Exception {
stop(kernel, ACTIVATIONSPEC_NAME);
stop(kernel, RESOURCE_ADAPTER_NAME);
- stop(kernel, BOOTSTRAPCONTEXT_NAME);
+ stop(kernel, WORKMANAGER_NAME);
}
public static void stop(Kernel kernel, ObjectName name) throws Exception {
1.2 +9 -3
openejb/modules/core/src/test/org/openejb/mdb/mockra/MockEndpointWorker.java
Index: MockEndpointWorker.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/test/org/openejb/mdb/mockra/MockEndpointWorker.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockEndpointWorker.java 13 Mar 2004 17:09:29 -0000 1.1
+++ MockEndpointWorker.java 15 Jul 2004 03:34:21 -0000 1.2
@@ -56,6 +56,7 @@
package org.openejb.mdb.mockra;
import java.lang.reflect.Method;
+
import javax.jms.Message;
import javax.jms.MessageListener;
import javax.resource.spi.endpoint.MessageEndpoint;
@@ -64,6 +65,7 @@
import javax.resource.spi.work.WorkException;
import EDU.oswego.cs.dl.util.concurrent.Latch;
+import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
/**
* @version $Revision$ $Date$
@@ -82,6 +84,7 @@
private MockResourceAdapter adapter;
private MockEndpointActivationKey endpointActivationKey;
+ private SynchronizedBoolean started = new SynchronizedBoolean(false);
Latch stopLatch = new Latch();
boolean stopping = false;
private MessageEndpointFactory messageEndpointFactory;
@@ -102,7 +105,7 @@
messageEndpointFactory = endpointActivationKey.getMessageEndpointFactory();
activationSpec = endpointActivationKey.getActivationSpec();
- adapter.getBootstrapContext().getWorkManager().doWork(this);
+ adapter.getBootstrapContext().getWorkManager().scheduleWork(this);
}
/**
@@ -110,7 +113,9 @@
*/
public void stop() throws InterruptedException {
release();
- stopLatch.acquire();
+ if (started.get()) {
+ stopLatch.acquire();
+ }
}
/**
@@ -124,6 +129,7 @@
* @see java.lang.Runnable#run()
*/
public void run() {
+ started.set(true);
try {
MessageEndpoint endpoint = null;
