dain 2006/02/01 06:50:15
Modified: modules/openejb-builder/src/test/org/openejb/deployment/mdb
BasicMDBContainerTest.java
Added: modules/openejb-builder/src/test/org/openejb/deployment/mdb
BasicMdbContainerTest.java
Log:
Major refactor
Split container into an object to represent a deployed ejb and a set of
shared containers which process invocations
Introduced interface between CMP container and CMP engine
Revision Changes Path
1.7 +15 -29
openejb/modules/openejb-builder/src/test/org/openejb/deployment/mdb/BasicMDBContainerTest.java
Index: BasicMDBContainerTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/mdb/BasicMDBContainerTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BasicMDBContainerTest.java 15 Mar 2005 05:32:44 -0000 1.6
+++ BasicMDBContainerTest.java 1 Feb 2006 11:50:14 -0000 1.7
@@ -44,52 +44,37 @@
*/
package org.openejb.deployment.mdb;
-import java.util.HashMap;
-import java.util.HashSet;
-
import junit.framework.TestCase;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.kernel.Kernel;
import org.openejb.deployment.DeploymentHelper;
-import org.openejb.deployment.MDBContainerBuilder;
-import org.openejb.dispatch.InterfaceMethodSignature;
-import org.openejb.transaction.TransactionPolicySource;
-import org.openejb.transaction.TransactionPolicyType;
+import org.openejb.deployment.MdbBuilder;
/**
* @version $Revision$ $Date$
*/
-public class BasicMDBContainerTest extends TestCase {
+public class BasicMdbContainerTest extends TestCase {
private Kernel kernel;
- private GBeanData container;
protected void setUp() throws Exception {
super.setUp();
kernel = DeploymentHelper.setUpKernelWithTransactionManager();
- DeploymentHelper.setUpTimer(kernel);
DeploymentHelper.setUpResourceAdapter(kernel);
- MDBContainerBuilder builder = new MDBContainerBuilder();
- builder.setClassLoader(this.getClass().getClassLoader());
-
builder.setContainerId(DeploymentHelper.CONTAINER_NAME.getCanonicalName());
- builder.setEJBName("MockEJB");
- builder.setBeanClassName(MockEJB.class.getName());
+ MdbBuilder builder = new MdbBuilder();
+ builder.setContainerId(DeploymentHelper.CONTAINER_NAME);
+ builder.setEjbName("MockEJB");
+
builder.setEndpointInterfaceName("javax.jms.MessageListener");
+ builder.setBeanClassName(MockEJB.class.getName());
+
builder.setActivationSpecName(DeploymentHelper.ACTIVATIONSPEC_NAME);
- builder.setUnshareableResources(new HashSet());
- builder.setTransactionPolicySource(new TransactionPolicySource() {
- public TransactionPolicyType getTransactionPolicy(String
methodIntf, InterfaceMethodSignature signature) {
- return TransactionPolicyType.Required;
- }
- });
- builder.setComponentContext(new HashMap());
- container = builder.createConfiguration();
+
+ builder.setEjbContainerName(DeploymentHelper.MDB_EJB_CONTAINER_NAME);
+
+ GBeanData container = builder.createConfiguration();
container.setName(DeploymentHelper.CONTAINER_NAME);
- //start the ejb container
- container.setReferencePattern("TransactionContextManager",
DeploymentHelper.TRANSACTIONCONTEXTMANAGER_NAME);
- container.setReferencePattern("TrackedConnectionAssociator",
DeploymentHelper.TRACKEDCONNECTIONASSOCIATOR_NAME);
- container.setReferencePattern("Timer",
DeploymentHelper.TRANSACTIONALTIMER_NAME);
kernel.loadGBean(container, getClass().getClassLoader());
kernel.startGBean(DeploymentHelper.CONTAINER_NAME);
}
@@ -100,6 +85,7 @@
DeploymentHelper.stop(kernel,
DeploymentHelper.TRACKEDCONNECTIONASSOCIATOR_NAME);
DeploymentHelper.tearDownAdapter(kernel);
kernel.shutdown();
+ super.tearDown();
}
1.1
openejb/modules/openejb-builder/src/test/org/openejb/deployment/mdb/BasicMdbContainerTest.java
Index: BasicMdbContainerTest.java
===================================================================
/**
* Redistribution and use of this software and associated documentation
* ("Software"), with or without modification, are permitted provided
* that the following conditions are met:
*
* 1. Redistributions of source code must retain copyright
* statements and notices. Redistributions must also contain a
* copy of this document.
*
* 2. Redistributions in binary form must reproduce the
* above copyright notice, this list of conditions and the
* following disclaimer in the documentation and/or other
* materials provided with the distribution.
*
* 3. The name "OpenEJB" must not be used to endorse or promote
* products derived from this Software without prior written
* permission of The OpenEJB Group. For written permission,
* please contact [EMAIL PROTECTED]
*
* 4. Products derived from this Software may not be called "OpenEJB"
* nor may "OpenEJB" appear in their names without prior written
* permission of The OpenEJB Group. OpenEJB is a registered
* trademark of The OpenEJB Group.
*
* 5. Due credit should be given to the OpenEJB Project
* (http://openejb.org/).
*
* THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
* NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
* THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Copyright 2001 (C) The OpenEJB Group. All Rights Reserved.
*
* $Id: BasicMdbContainerTest.java,v 1.1 2006/02/01 11:50:14 dain Exp $
*/
package org.openejb.deployment.mdb;
import junit.framework.TestCase;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.kernel.Kernel;
import org.openejb.deployment.DeploymentHelper;
import org.openejb.deployment.MdbBuilder;
/**
* @version $Revision: 1.1 $ $Date: 2006/02/01 11:50:14 $
*/
public class BasicMdbContainerTest extends TestCase {
private Kernel kernel;
protected void setUp() throws Exception {
super.setUp();
kernel = DeploymentHelper.setUpKernelWithTransactionManager();
DeploymentHelper.setUpResourceAdapter(kernel);
MdbBuilder builder = new MdbBuilder();
builder.setContainerId(DeploymentHelper.CONTAINER_NAME);
builder.setEjbName("MockEJB");
builder.setEndpointInterfaceName("javax.jms.MessageListener");
builder.setBeanClassName(MockEJB.class.getName());
builder.setActivationSpecName(DeploymentHelper.ACTIVATIONSPEC_NAME);
builder.setEjbContainerName(DeploymentHelper.MDB_EJB_CONTAINER_NAME);
GBeanData container = builder.createConfiguration();
container.setName(DeploymentHelper.CONTAINER_NAME);
kernel.loadGBean(container, getClass().getClassLoader());
kernel.startGBean(DeploymentHelper.CONTAINER_NAME);
}
protected void tearDown() throws Exception {
DeploymentHelper.stop(kernel, DeploymentHelper.CONTAINER_NAME);
DeploymentHelper.stop(kernel,
DeploymentHelper.TRANSACTIONMANAGER_NAME);
DeploymentHelper.stop(kernel,
DeploymentHelper.TRACKEDCONNECTIONASSOCIATOR_NAME);
DeploymentHelper.tearDownAdapter(kernel);
kernel.shutdown();
super.tearDown();
}
public void testMessage() throws Exception {
// @todo put a wait limit in here... otherwise this can lock a build
// Wait for 3 messages to arrive..
System.out.println("Waiting for message 1");
assertTrue(MockEJB.messageCounter.attempt(10000));
System.out.println("Waiting for message 2");
assertTrue(MockEJB.messageCounter.attempt(10000));
System.out.println("Waiting for message 3");
assertTrue(MockEJB.messageCounter.attempt(10000));
System.out.println("Done.");
assertTrue("Timer should have fired once by now...",
MockEJB.timerFired);
}
}
