[jboss-cvs] JBossAS SVN: r106693 - in trunk: component-matrix and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 14 02:17:06 EDT 2010
Author: ALRubinger
Date: 2010-07-14 02:17:05 -0400 (Wed, 14 Jul 2010)
New Revision: 106693
Added:
trunk/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ejb3/async/
Modified:
trunk/build/build.xml
trunk/component-matrix/pom.xml
trunk/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ServerIntegrationTest.java
trunk/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ejb3/async/AsyncBean.java
trunk/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ejb3/async/AsyncLocalBusiness.java
Log:
[JBAS-8146] First-pass integration of ejb3-async into AS trunk
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-07-14 05:08:06 UTC (rev 106692)
+++ trunk/build/build.xml 2010-07-14 06:17:05 UTC (rev 106693)
@@ -745,6 +745,7 @@
<include name="jboss-ejb3-singleton-deployer-jboss-beans.xml"/>
</fileset>
<fileset refid="org.jboss.ejb3:jboss-ejb3-timerservice-deployer:jar"/>
+ <fileset refid="org.jboss.ejb3.async:jboss-ejb3-async-deployer:jar"/>
<!-- Strip version numbers from the jar names -->
<mapper refid="remove-versions" />
</copy>
@@ -2081,6 +2082,8 @@
<fileset refid="jboss:jboss-serialization:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-cache:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-common:jar"/>
+ <fileset refid="org.jboss.ejb3.async:jboss-ejb3-async-spi:jar"/>
+ <fileset refid="org.jboss.ejb3.async:jboss-ejb3-async-impl:jar"/>
<fileset refid="org.jboss.ejb3.concurrency:jboss-ejb3-concurrency-aop:jar"/>
<fileset refid="org.jboss.ejb3.concurrency:jboss-ejb3-concurrency-impl:jar"/>
<fileset refid="org.jboss.ejb3.container:jboss-ejb3-container-spi:jar"/>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-07-14 05:08:06 UTC (rev 106692)
+++ trunk/component-matrix/pom.xml 2010-07-14 06:17:05 UTC (rev 106693)
@@ -104,7 +104,7 @@
<version.org.jboss.cluster.server.core>1.0.0.Alpha2</version.org.jboss.cluster.server.core>
<version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
<version.org.jboss.deployers>2.2.0.Alpha6</version.org.jboss.deployers>
- <version.org.jboss.ejb3.bom>0.2.0-alpha-2</version.org.jboss.ejb3.bom>
+ <version.org.jboss.ejb3.bom>0.2.0-alpha-4</version.org.jboss.ejb3.bom>
<!-- This to move into the EJB3 BOM -->
<version.org.jboss.ejb3.embedded>1.0.0-alpha-1</version.org.jboss.ejb3.embedded>
<version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
Modified: trunk/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ServerIntegrationTest.java
===================================================================
--- trunk/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ServerIntegrationTest.java 2010-07-14 05:08:06 UTC (rev 106692)
+++ trunk/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ServerIntegrationTest.java 2010-07-14 06:17:05 UTC (rev 106693)
@@ -29,6 +29,8 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.concurrent.BrokenBarrierException;
+import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.logging.Logger;
@@ -59,6 +61,8 @@
import org.jboss.ejb3.embedded.api.JBossEJBContainer;
import org.jboss.embedded.api.server.JBossASEmbeddedServer;
import org.jboss.embedded.api.server.JBossASEmbeddedServerFactory;
+import org.jboss.jbossas.embedded.testsuite.ejb3.async.AsyncBean;
+import org.jboss.jbossas.embedded.testsuite.ejb3.async.AsyncLocalBusiness;
import org.jboss.jbossas.embedded.testsuite.ejb3.entity.Jbossian;
import org.jboss.jbossas.embedded.testsuite.ejb3.entity.JbossianRegistrarBean;
import org.jboss.jbossas.embedded.testsuite.ejb3.entity.JbossianRegistrarLocalBusiness;
@@ -288,6 +292,66 @@
}
/**
+ * Tests EJB3 3.1 @Asynchronous support
+ */
+ @Test
+ public void testEjb31Async() throws Exception
+ {
+ // Log
+ log.info("testEjb31Async");
+
+ // Make a deployment
+ final String name = "ejb31async.jar";
+ final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, name).addPackage(
+ AsyncLocalBusiness.class.getPackage());
+ log.info(archive.toString(true));
+ // Deploy
+ server.deploy(archive);
+
+ // Test
+ try
+ {
+ final AsyncLocalBusiness bean = (AsyncLocalBusiness) NAMING_CONTEXT.lookup(AsyncBean.class.getSimpleName()
+ + JNDI_SUFFIX_LOCAL_BUSINESS);
+ final Future<Integer> invocation = bean.getNextCounter();
+
+ // Signal to the bean we're here (to ensure this is an async invocation)
+ try
+ {
+ AsyncBean.BARRIER.await(10, TimeUnit.SECONDS);
+ log.info("Barrier met by all parties");
+ }
+ catch (final InterruptedException e)
+ {
+ Thread.interrupted();
+ Assert.fail("Interrupted while waiting");
+ }
+ catch (BrokenBarrierException e)
+ {
+ Assert.fail("Barrier was broken while waiting: " + e);
+ }
+ catch (TimeoutException e)
+ {
+ Assert.fail("All parties did not arrive at the barrier in the specified time:" + e);
+ }
+
+ // Block and test
+ final int value = invocation.get();
+ Assert.assertEquals("First invocation did not return correct result", 1, value);
+ log.info("Got: " + invocation);
+ log.info("Invocation value: " + value);
+ Assert.assertTrue("First invocation did not report as completed", invocation.isDone());
+ Assert.assertFalse("Invocation should not report as cancelled", invocation.isCancelled());
+ }
+ finally
+ {
+ // Undeploy
+ server.undeploy(archive);
+ }
+
+ }
+
+ /**
* Tests deployment of a virtual WAR containing a servlet
* and JSP.
*
Copied: trunk/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ejb3/async (from rev 106692, branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ejb3/async)
Modified: trunk/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ejb3/async/AsyncBean.java
===================================================================
Modified: trunk/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ejb3/async/AsyncLocalBusiness.java
===================================================================
More information about the jboss-cvs-commits
mailing list