[jboss-cvs] JBossAS SVN: r93431 - in projects/jboss-jca/trunk: core and 21 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 11 15:34:45 EDT 2009
Author: jesper.pedersen
Date: 2009-09-11 15:34:44 -0400 (Fri, 11 Sep 2009)
New Revision: 93431
Added:
projects/jboss-jca/trunk/embedded/
projects/jboss-jca/trunk/embedded/.classpath
projects/jboss-jca/trunk/embedded/.project
projects/jboss-jca/trunk/embedded/build.xml
projects/jboss-jca/trunk/embedded/src/
projects/jboss-jca/trunk/embedded/src/main/
projects/jboss-jca/trunk/embedded/src/main/java/
projects/jboss-jca/trunk/embedded/src/main/java/org/
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/SecurityActions.java
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/package.html
projects/jboss-jca/trunk/embedded/src/main/resources/
projects/jboss-jca/trunk/embedded/src/main/resources/embedded-manifest.mf
projects/jboss-jca/trunk/embedded/src/main/resources/jca.xml
projects/jboss-jca/trunk/embedded/src/main/resources/naming.xml
projects/jboss-jca/trunk/embedded/src/main/resources/transaction.xml
Modified:
projects/jboss-jca/trunk/build.xml
projects/jboss-jca/trunk/core/build.xml
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/mdr/unit/MetaDataRepositoryTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkAdapterTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkListenerTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerDoWorkTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerScheduleWorkTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerStartWorkTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section1/ManageThreadTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkInterfaceTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkListenerInterfaceTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagementModelTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/api/WorkContextProviderGetWorkContextsTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/section4/subsection3/WorkContextHandlingAssignmentTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/section5/TransactionContextTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/section7/WorkContextSetupListenerTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/workmanager/unit/WorkManagerTestCase.java
projects/jboss-jca/trunk/core/src/test/resources/mdr-jboss-beans.xml
projects/jboss-jca/trunk/core/src/test/resources/naming-jboss-beans.xml
projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagementModelTestCase-jboss-beans.xml
projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase-jboss-beans.xml
projects/jboss-jca/trunk/core/src/test/resources/transaction-jboss-beans.xml
projects/jboss-jca/trunk/core/src/test/resources/workmanager-jboss-beans.xml
projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java
projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployer.java
projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployerMBean.java
projects/jboss-jca/trunk/ivy.xml
Log:
[JBJCA-166] Initial embedded configuration
Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/build.xml 2009-09-11 19:34:44 UTC (rev 93431)
@@ -85,7 +85,6 @@
<property name="version.jboss.classloading" value="2.0.6.GA"/>
<property name="version.jboss.common" value="2.2.15.GA"/>
<property name="version.jboss.deployers" value="2.0.8.GA"/>
- <property name="version.jboss.ejb3.test" value="1.0.0"/>
<property name="version.jboss.integration" value="5.1.0.CR1"/>
<property name="version.jboss.logging" value="2.2.0.CR1"/>
<property name="version.jboss.logging.metadata" value="1.0.0.CR3"/>
@@ -202,6 +201,7 @@
<ant dir="common" inheritRefs="true" target="jars"/>
<ant dir="core" inheritRefs="true" target="jars"/>
<ant dir="deployers" inheritRefs="true" target="jars"/>
+ <ant dir="embedded" inheritRefs="true" target="jars"/>
<ant dir="sjc" inheritRefs="true" target="jars"/>
<ant dir="standalone" inheritRefs="true" target="jars"/>
</target>
@@ -215,6 +215,7 @@
<ant dir="common" inheritRefs="true" target="docs"/>
<ant dir="core" inheritRefs="true" target="docs"/>
<ant dir="deployers" inheritRefs="true" target="docs"/>
+ <ant dir="embedded" inheritRefs="true" target="docs"/>
<ant dir="sjc" inheritRefs="true" target="docs"/>
<ant dir="standalone" inheritRefs="true" target="docs"/>
</target>
Modified: projects/jboss-jca/trunk/core/build.xml
===================================================================
--- projects/jboss-jca/trunk/core/build.xml 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/build.xml 2009-09-11 19:34:44 UTC (rev 93431)
@@ -104,6 +104,9 @@
<jvmarg line="${junit.jvm.options}"/>
<sysproperty key="test.dir" value="${test.dir}"/>
<sysproperty key="xb.builder.useUnorderedSequence" value="true"/>
+ <sysproperty key="java.util.logging.manager" value="org.jboss.logmanager.LogManager"/>
+ <sysproperty key="org.jboss.logging.Logger.pluginClass" value="org.jboss.logging.logmanager.LoggerPluginImpl"/>
+ <sysproperty key="log4j.defaultInitOverride" value="true"/>
<classpath>
<pathelement location="${build.core.dir}/test"/>
@@ -146,6 +149,9 @@
<jvmarg line="${junit.jvm.options}"/>
<sysproperty key="test.dir" value="${test.dir}"/>
<sysproperty key="xb.builder.useUnorderedSequence" value="true"/>
+ <sysproperty key="java.util.logging.manager" value="org.jboss.logmanager.LogManager"/>
+ <sysproperty key="org.jboss.logging.Logger.pluginClass" value="org.jboss.logging.logmanager.LoggerPluginImpl"/>
+ <sysproperty key="log4j.defaultInitOverride" value="true"/>
<classpath>
<pathelement location="${build.core.dir}/test"/>
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/mdr/unit/MetaDataRepositoryTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/mdr/unit/MetaDataRepositoryTestCase.java 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/mdr/unit/MetaDataRepositoryTestCase.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -23,8 +23,8 @@
package org.jboss.jca.test.core.mdr.unit;
import org.jboss.jca.core.api.MetaDataRepository;
+import org.jboss.jca.embedded.EmbeddedJCA;
-import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
import org.jboss.logging.Logger;
import org.jboss.metadata.rar.jboss.RARDeploymentMetaData;
import org.jboss.metadata.rar.jboss.mcf.ManagedConnectionFactoryDeploymentGroup;
@@ -53,9 +53,9 @@
private static Logger log = Logger.getLogger(MetaDataRepositoryTestCase.class);
/*
- * Bootstrap (MC Facade)
+ * Embedded
*/
- private static EmbeddedTestMcBootstrap bootstrap;
+ private static EmbeddedJCA embedded;
// --------------------------------------------------------------------------------||
// Tests --------------------------------------------------------------------------||
@@ -69,7 +69,7 @@
public void testDefined() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
}
@@ -82,7 +82,7 @@
public void testAddRARDeploymentMetaDataNullName() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -105,7 +105,7 @@
public void testAddRARDeploymentMetaDataNullRDMD() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -128,7 +128,7 @@
public void testAddRARDeploymentMetaData() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -146,7 +146,7 @@
public void testAddRARDeploymentMetaDataPreviousValue() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -169,7 +169,7 @@
public void testGetRARDeploymentMetaDataNullName() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -192,7 +192,7 @@
public void testGetRARDeploymentMetaDataUndefinedName() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -208,7 +208,7 @@
public void testGetRARDeploymentMetaData() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -232,7 +232,7 @@
public void testMultiAddGetRARDeploymentMetaData() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -263,7 +263,7 @@
public void testRemoveRARDeploymentMetaDataNullName() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -286,7 +286,7 @@
public void testRemoveRARDeploymentMetaDataUndefinedName() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -301,7 +301,7 @@
public void testRemoveRARDeploymentMetaData() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -319,7 +319,7 @@
public void testAddMCFDGNullName() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -342,7 +342,7 @@
public void testAddMCFDGNullGroup() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -365,7 +365,7 @@
public void testAddMCFDG() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -383,7 +383,7 @@
public void testAddMCFDGPreviousValue() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -406,7 +406,7 @@
public void testGetMCFDGNullName() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -429,7 +429,7 @@
public void testGetMCFDGUndefinedName() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -445,7 +445,7 @@
public void testGetMCFDG() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -468,7 +468,7 @@
public void testMultiAddGetMCFDG() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -499,7 +499,7 @@
public void testRemoveMCFDGNullName() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -522,7 +522,7 @@
public void testRemoveMCFDGUndefinedName() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -537,7 +537,7 @@
public void testRemoveMCFDG() throws Throwable
{
MetaDataRepository mdr =
- bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
+ embedded.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
@@ -558,11 +558,14 @@
@BeforeClass
public static void beforeClass() throws Throwable
{
- // Create and set a new MC Bootstrap
- bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
+ // Create and set an embedded JCA instance
+ embedded = new EmbeddedJCA(false);
+ // Startup
+ embedded.startup();
+
// Deploy MDR
- bootstrap.deploy(MetaDataRepositoryTestCase.class.getClassLoader(), "mdr-jboss-beans.xml");
+ embedded.deploy(MetaDataRepositoryTestCase.class.getClassLoader(), "mdr-jboss-beans.xml");
}
/**
@@ -573,12 +576,12 @@
public static void afterClass() throws Throwable
{
// Undeploy MDR
- bootstrap.undeploy(MetaDataRepositoryTestCase.class.getClassLoader(), "mdr-jboss-beans.xml");
+ embedded.undeploy(MetaDataRepositoryTestCase.class.getClassLoader(), "mdr-jboss-beans.xml");
- // Shutdown MC
- bootstrap.shutdown();
+ // Shutdown embedded
+ embedded.shutdown();
- // Set Bootstrap to null
- bootstrap = null;
+ // Set embedded to null
+ embedded = null;
}
}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkAdapterTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkAdapterTestCase.java 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkAdapterTestCase.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.test.core.spec.chapter10.api;
+import org.jboss.jca.embedded.EmbeddedJCA;
import org.jboss.jca.test.core.spec.chapter10.common.CallbackCount;
import org.jboss.jca.test.core.spec.chapter10.common.LongRunningWork;
import org.jboss.jca.test.core.spec.chapter10.common.MyWorkAdapter;
@@ -31,8 +32,6 @@
import javax.resource.spi.work.Work;
import javax.resource.spi.work.WorkManager;
-import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -50,11 +49,10 @@
public class WorkAdapterTestCase
{
/*
- * Bootstrap (MC Facade)
+ * Embedded
*/
- private static EmbeddedTestMcBootstrap bootstrap;
+ private static EmbeddedJCA embedded;
-
/**
* workAccepted method
* @throws Throwable throwable exception
@@ -62,7 +60,7 @@
@Test
public void testWorkAcceptedStatus() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
Work work1 = new ShortRunningWork();
Work work2 = new ShortRunningWork();
@@ -96,7 +94,7 @@
@Test
public void testWorkStartedStatus() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -129,7 +127,7 @@
@Test
public void testWorkCompletedStatus() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start2 = new CountDownLatch(1);
final CountDownLatch done2 = new CountDownLatch(1);
@@ -169,13 +167,16 @@
@BeforeClass
public static void beforeClass() throws Throwable
{
- // Create and set a new MC Bootstrap
- bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
+ // Create and set an embedded JCA instance
+ embedded = new EmbeddedJCA(false);
+ // Startup
+ embedded.startup();
+
// Deploy Naming, Transaction and WorkManager
- bootstrap.deploy(WorkAdapterTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- bootstrap.deploy(WorkAdapterTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.deploy(WorkAdapterTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.deploy(WorkAdapterTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.deploy(WorkAdapterTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.deploy(WorkAdapterTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
}
/**
@@ -186,14 +187,14 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- bootstrap.undeploy(WorkAdapterTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
- bootstrap.undeploy(WorkAdapterTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.undeploy(WorkAdapterTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.undeploy(WorkAdapterTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.undeploy(WorkAdapterTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.undeploy(WorkAdapterTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- // Shutdown MC
- bootstrap.shutdown();
+ // Shutdown
+ embedded.shutdown();
- // Set Bootstrap to null
- bootstrap = null;
+ // Set embedded to null
+ embedded = null;
}
}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkListenerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkListenerTestCase.java 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkListenerTestCase.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.test.core.spec.chapter10.api;
+import org.jboss.jca.embedded.EmbeddedJCA;
import org.jboss.jca.test.core.spec.chapter10.common.CallbackCount;
import org.jboss.jca.test.core.spec.chapter10.common.LongRunningWork;
import org.jboss.jca.test.core.spec.chapter10.common.MyWorkAdapter;
@@ -31,8 +32,6 @@
import javax.resource.spi.work.Work;
import javax.resource.spi.work.WorkManager;
-import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -50,11 +49,10 @@
public class WorkListenerTestCase
{
/*
- * Bootstrap (MC Facade)
+ * Embedded
*/
- private static EmbeddedTestMcBootstrap bootstrap;
+ private static EmbeddedJCA embedded;
-
/**
* workAccepted method
* @throws Throwable throwable exception
@@ -62,7 +60,7 @@
@Test
public void testWorkAcceptedStatus() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
Work work1 = new ShortRunningWork();
Work work2 = new ShortRunningWork();
@@ -96,7 +94,7 @@
@Test
public void testWorkStartedStatus() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -129,7 +127,7 @@
@Test
public void testWorkCompletedStatus() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start2 = new CountDownLatch(1);
final CountDownLatch done2 = new CountDownLatch(1);
@@ -169,13 +167,16 @@
@BeforeClass
public static void beforeClass() throws Throwable
{
- // Create and set a new MC Bootstrap
- bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
+ // Create and set an embedded JCA instance
+ embedded = new EmbeddedJCA(false);
+ // Startup
+ embedded.startup();
+
// Deploy Naming, Transaction and WorkManager
- bootstrap.deploy(WorkListenerTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- bootstrap.deploy(WorkListenerTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.deploy(WorkListenerTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.deploy(WorkListenerTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.deploy(WorkListenerTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.deploy(WorkListenerTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
}
/**
@@ -186,14 +187,14 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- bootstrap.undeploy(WorkListenerTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
- bootstrap.undeploy(WorkListenerTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.undeploy(WorkListenerTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.undeploy(WorkListenerTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.undeploy(WorkListenerTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.undeploy(WorkListenerTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- // Shutdown MC
- bootstrap.shutdown();
+ // Shutdown
+ embedded.shutdown();
- // Set Bootstrap to null
- bootstrap = null;
+ // Set embedded to null
+ embedded = null;
}
}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerDoWorkTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerDoWorkTestCase.java 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerDoWorkTestCase.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.test.core.spec.chapter10.api;
+import org.jboss.jca.embedded.EmbeddedJCA;
import org.jboss.jca.test.core.spec.chapter10.common.CallbackCount;
import org.jboss.jca.test.core.spec.chapter10.common.MyWorkAdapter;
import org.jboss.jca.test.core.spec.chapter10.common.ShortRunningWork;
@@ -30,8 +31,6 @@
import javax.resource.spi.work.WorkException;
import javax.resource.spi.work.WorkManager;
-import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -49,9 +48,9 @@
public class WorkManagerDoWorkTestCase
{
/*
- * Bootstrap (MC Facade)
+ * Embedded
*/
- private static EmbeddedTestMcBootstrap bootstrap;
+ private static EmbeddedJCA embedded;
/**
* doWork method: This call blocks until the Work instance completes execution.
@@ -60,7 +59,7 @@
@Test
public void testDoWork() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
ShortRunningWork work = new ShortRunningWork();
assertFalse(work.hasCallRun());
@@ -78,7 +77,7 @@
@Test(expected = WorkException.class)
public void testDoWorkNullWork() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
Work work = null;
workManager.doWork(work);
}
@@ -90,7 +89,7 @@
@Test(expected = WorkException.class)
public void testDoWorkThrowWorkException() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
Work work = null;
workManager.doWork(work);
}
@@ -125,7 +124,7 @@
@Test
public void testDoWorkFullSpec() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
ShortRunningWork work = new ShortRunningWork();
assertFalse(work.hasCallRun());
@@ -142,7 +141,7 @@
@Test(expected = WorkException.class)
public void testDoWorkFullSpecNullWork() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
Work work = null;
workManager.doWork(work, WorkManager.INDEFINITE, null, null);
@@ -156,7 +155,7 @@
@Test
public void testDoWorkFullSpecWithIndefiniteStartTimeout() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
ShortRunningWork work = new ShortRunningWork();
assertFalse(work.hasCallRun());
@@ -174,7 +173,7 @@
@Test
public void testDoWorkFullSpecWithImmediateStartTimeout() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
ShortRunningWork work = new ShortRunningWork();
assertFalse(work.hasCallRun());
@@ -191,7 +190,7 @@
@Test(expected = IllegalArgumentException.class)
public void testDoWorkFullSpecWithNegativeStartTimeout() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
ShortRunningWork work = new ShortRunningWork();
assertFalse(work.hasCallRun());
@@ -208,7 +207,7 @@
@Test
public void testDoWorkFullSpecWithExecutionContext() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
ExecutionContext ec = new ExecutionContext();
ShortRunningWork work = new ShortRunningWork();
@@ -226,7 +225,7 @@
@Test
public void testDoWorkFullSpecWithNullExecutionContext() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
ShortRunningWork work = new ShortRunningWork();
assertFalse(work.hasCallRun());
@@ -243,7 +242,7 @@
@Test
public void testDoWorkFullSpecWithWorkListener() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
ShortRunningWork work = new ShortRunningWork();
assertFalse(work.hasCallRun());
@@ -266,7 +265,7 @@
@Test
public void testDoWorkFullSpecWithWorkNullListener() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
ShortRunningWork work = new ShortRunningWork();
assertFalse(work.hasCallRun());
@@ -282,7 +281,7 @@
@Test(expected = WorkException.class)
public void testDoWorkFullSpecThrowWorkException() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
Work work = null;
workManager.doWork(work, WorkManager.INDEFINITE, null, null);
}
@@ -319,13 +318,16 @@
@BeforeClass
public static void beforeClass() throws Throwable
{
- // Create and set a new MC Bootstrap
- bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
+ // Create and set an embedded JCA instance
+ embedded = new EmbeddedJCA(false);
+ // Startup
+ embedded.startup();
+
// Deploy Naming, Transaction and WorkManager
- bootstrap.deploy(WorkManagerDoWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- bootstrap.deploy(WorkManagerDoWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.deploy(WorkManagerDoWorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.deploy(WorkManagerDoWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.deploy(WorkManagerDoWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.deploy(WorkManagerDoWorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
}
/**
@@ -336,14 +338,14 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- bootstrap.undeploy(WorkManagerDoWorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
- bootstrap.undeploy(WorkManagerDoWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.undeploy(WorkManagerDoWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.undeploy(WorkManagerDoWorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.undeploy(WorkManagerDoWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.undeploy(WorkManagerDoWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- // Shutdown MC
- bootstrap.shutdown();
+ // Shutdown
+ embedded.shutdown();
- // Set Bootstrap to null
- bootstrap = null;
+ // Set embedded to null
+ embedded = null;
}
}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerScheduleWorkTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerScheduleWorkTestCase.java 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerScheduleWorkTestCase.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.test.core.spec.chapter10.api;
+import org.jboss.jca.embedded.EmbeddedJCA;
import org.jboss.jca.test.core.spec.chapter10.common.CallbackCount;
import org.jboss.jca.test.core.spec.chapter10.common.LongRunningWork;
import org.jboss.jca.test.core.spec.chapter10.common.MyWorkAdapter;
@@ -32,8 +33,6 @@
import javax.resource.spi.work.WorkException;
import javax.resource.spi.work.WorkManager;
-import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -51,9 +50,9 @@
public class WorkManagerScheduleWorkTestCase
{
/*
- * Bootstrap (MC Facade)
+ * Embedded
*/
- private static EmbeddedTestMcBootstrap bootstrap;
+ private static EmbeddedJCA embedded;
/**
* scheduleWork method: TThis call does not block and returns immediately once a
@@ -63,7 +62,7 @@
@Test
public void testScheduleWork() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -85,7 +84,7 @@
@Test(expected = WorkException.class)
public void testScheduleWorkNullWork() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
Work work = null;
workManager.scheduleWork(work);
}
@@ -98,7 +97,7 @@
@Test(expected = WorkException.class)
public void testScheduleWorkThrowWorkException() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
Work work = null;
workManager.scheduleWork(work);
}
@@ -134,7 +133,7 @@
@Test
public void testScheduleWorkFullSpec() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -156,7 +155,7 @@
@Test(expected = WorkException.class)
public void testScheduleWorkFullSpecNullWork() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
Work work = null;
workManager.scheduleWork(work, WorkManager.INDEFINITE, null, null);
@@ -171,7 +170,7 @@
@Test
public void testScheduleWorkFullSpecWithIndefiniteStartTimeout() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -195,7 +194,7 @@
@Test
public void testScheduleWorkFullSpecWithImmediateStartTimeout() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -218,7 +217,7 @@
@Test(expected = IllegalArgumentException.class)
public void testScheduleWorkFullSpecWithUnknowStartTimeout() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -241,7 +240,7 @@
@Test(expected = IllegalArgumentException.class)
public void testScheduleWorkFullSpecWithNegativeStartTimeout() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -264,7 +263,7 @@
@Test
public void testScheduleWorkFullSpecWithExecutionContext() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -288,7 +287,7 @@
@Test
public void testScheduleWorkFullSpecWithNullExecutionContext() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -311,7 +310,7 @@
@Test
public void testScheduleWorkFullSpecWithWorkListener() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -340,7 +339,7 @@
@Test
public void testScheduleWorkFullSpecWithWorkNullListener() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -361,7 +360,7 @@
@Test(expected = WorkException.class)
public void testScheduleWorkFullSpecThrowWorkException() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
Work work = null;
workManager.scheduleWork(work, WorkManager.INDEFINITE, null, null);
}
@@ -398,13 +397,16 @@
@BeforeClass
public static void beforeClass() throws Throwable
{
- // Create and set a new MC Bootstrap
- bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
+ // Create and set an embedded JCA instance
+ embedded = new EmbeddedJCA(false);
+ // Startup
+ embedded.startup();
+
// Deploy Naming, Transaction and WorkManager
- bootstrap.deploy(WorkManagerScheduleWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- bootstrap.deploy(WorkManagerScheduleWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.deploy(WorkManagerScheduleWorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.deploy(WorkManagerScheduleWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.deploy(WorkManagerScheduleWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.deploy(WorkManagerScheduleWorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
}
/**
@@ -415,14 +417,14 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- bootstrap.undeploy(WorkManagerScheduleWorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
- bootstrap.undeploy(WorkManagerScheduleWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.undeploy(WorkManagerScheduleWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.undeploy(WorkManagerScheduleWorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.undeploy(WorkManagerScheduleWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.undeploy(WorkManagerScheduleWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- // Shutdown MC
- bootstrap.shutdown();
+ // Shutdown embedded
+ embedded.shutdown();
- // Set Bootstrap to null
- bootstrap = null;
+ // Set embedded to null
+ embedded = null;
}
}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerStartWorkTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerStartWorkTestCase.java 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerStartWorkTestCase.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.test.core.spec.chapter10.api;
+import org.jboss.jca.embedded.EmbeddedJCA;
import org.jboss.jca.test.core.spec.chapter10.common.CallbackCount;
import org.jboss.jca.test.core.spec.chapter10.common.LongRunningWork;
import org.jboss.jca.test.core.spec.chapter10.common.MyWorkAdapter;
@@ -32,8 +33,6 @@
import javax.resource.spi.work.WorkException;
import javax.resource.spi.work.WorkManager;
-import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -51,9 +50,9 @@
public class WorkManagerStartWorkTestCase
{
/*
- * Bootstrap (MC Facade)
+ * Embedded
*/
- private static EmbeddedTestMcBootstrap bootstrap;
+ private static EmbeddedJCA embedded;
/**
* startWork method: This call blocks until the Work instance starts execution but
@@ -63,7 +62,7 @@
@Test
public void testStartWork() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -85,7 +84,7 @@
@Test(expected = WorkException.class)
public void testStartWorkNullWork() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
Work work = null;
workManager.startWork(work);
}
@@ -109,7 +108,7 @@
@Test(expected = WorkException.class)
public void testStartWorkThrowWorkException() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
Work work = null;
workManager.startWork(work);
}
@@ -145,7 +144,7 @@
@Test
public void testStartWorkFullSpec() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -167,7 +166,7 @@
@Test(expected = WorkException.class)
public void testStartWorkFullSpecNullWork() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
Work work = null;
workManager.startWork(work, WorkManager.INDEFINITE, null, null);
@@ -182,7 +181,7 @@
@Test
public void testStartWorkFullSpecWithIndefiniteStartTimeout() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -206,7 +205,7 @@
@Test
public void testStartWorkFullSpecWithImmediateStartTimeout() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -229,7 +228,7 @@
@Test(expected = IllegalArgumentException.class)
public void testStartWorkFullSpecWithUnknowStartTimeout() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -252,7 +251,7 @@
@Test(expected = IllegalArgumentException.class)
public void testStartWorkFullSpecWithNegativeStartTimeout() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -275,7 +274,7 @@
@Test
public void testStartWorkFullSpecWithExecutionContext() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -299,7 +298,7 @@
@Test
public void testStartWorkFullSpecWithNullExecutionContext() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -322,7 +321,7 @@
@Test
public void testStartWorkFullSpecWithWorkListener() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -351,7 +350,7 @@
@Test
public void testStartWorkFullSpecWithWorkNullListener() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -383,7 +382,7 @@
@Test(expected = WorkException.class)
public void testStartWorkFullSpecThrowWorkException() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
Work work = null;
workManager.startWork(work, WorkManager.INDEFINITE, null, null);
}
@@ -420,13 +419,16 @@
@BeforeClass
public static void beforeClass() throws Throwable
{
- // Create and set a new MC Bootstrap
- bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
+ // Create and set an embedded JCA instance
+ embedded = new EmbeddedJCA(false);
+ // Startup
+ embedded.startup();
+
// Deploy Naming, Transaction and WorkManager
- bootstrap.deploy(WorkManagerStartWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- bootstrap.deploy(WorkManagerStartWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.deploy(WorkManagerStartWorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.deploy(WorkManagerStartWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.deploy(WorkManagerStartWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.deploy(WorkManagerStartWorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
}
/**
@@ -437,14 +439,14 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- bootstrap.undeploy(WorkManagerStartWorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
- bootstrap.undeploy(WorkManagerStartWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.undeploy(WorkManagerStartWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.undeploy(WorkManagerStartWorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.undeploy(WorkManagerStartWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.undeploy(WorkManagerStartWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- // Shutdown MC
- bootstrap.shutdown();
+ // Shutdown embedded
+ embedded.shutdown();
- // Set Bootstrap to null
- bootstrap = null;
+ // Set embedded to null
+ embedded = null;
}
}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkTestCase.java 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkTestCase.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.test.core.spec.chapter10.api;
+import org.jboss.jca.embedded.EmbeddedJCA;
import org.jboss.jca.test.core.spec.chapter10.common.LongRunningWork;
import org.jboss.jca.test.core.spec.chapter10.common.ShortRunningWork;
@@ -28,8 +29,6 @@
import javax.resource.spi.work.WorkManager;
-import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -46,9 +45,9 @@
public class WorkTestCase
{
/*
- * Bootstrap (MC Facade)
+ * Embedded
*/
- private static EmbeddedTestMcBootstrap bootstrap;
+ private static EmbeddedJCA embedded;
/**
* testRun
@@ -59,7 +58,7 @@
@Test
public void testRun() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
ShortRunningWork work = new ShortRunningWork();
assertFalse(work.hasCallRun());
@@ -76,7 +75,7 @@
@Test
public void testRelease() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
ShortRunningWork shortWork = new ShortRunningWork();
workManager.startWork(shortWork);
@@ -102,13 +101,16 @@
@BeforeClass
public static void beforeClass() throws Throwable
{
- // Create and set a new MC Bootstrap
- bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
+ // Create and set an embedded JCA instance
+ embedded = new EmbeddedJCA(false);
+ // Startup
+ embedded.startup();
+
// Deploy Naming, Transaction and WorkManager
- bootstrap.deploy(WorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- bootstrap.deploy(WorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.deploy(WorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.deploy(WorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.deploy(WorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.deploy(WorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
}
/**
@@ -119,14 +121,14 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- bootstrap.undeploy(WorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
- bootstrap.undeploy(WorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.undeploy(WorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.undeploy(WorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.undeploy(WorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.undeploy(WorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- // Shutdown MC
- bootstrap.shutdown();
+ // Shutdown embedded
+ embedded.shutdown();
- // Set Bootstrap to null
- bootstrap = null;
+ // Set embedded to null
+ embedded = null;
}
}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section1/ManageThreadTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section1/ManageThreadTestCase.java 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section1/ManageThreadTestCase.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -22,9 +22,8 @@
package org.jboss.jca.test.core.spec.chapter10.section1;
import org.jboss.jca.common.api.ThreadPool;
+import org.jboss.jca.embedded.EmbeddedJCA;
-import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -42,9 +41,9 @@
public class ManageThreadTestCase
{
/*
- * Bootstrap (MC Facade)
+ * Embedded
*/
- private static EmbeddedTestMcBootstrap bootstrap;
+ private static EmbeddedJCA embedded;
/**
* Test for paragraph 4 : bullet 1
@@ -54,7 +53,7 @@
public void testWorkManagerHasThreadPool() throws Throwable
{
org.jboss.jca.core.api.WorkManager workManager =
- bootstrap.lookup("WorkManager", org.jboss.jca.core.api.WorkManager.class);
+ embedded.lookup("WorkManager", org.jboss.jca.core.api.WorkManager.class);
ThreadPool threadPool = workManager.getThreadPool();
assertNotNull(threadPool);
}
@@ -105,13 +104,16 @@
@BeforeClass
public static void beforeClass() throws Throwable
{
- // Create and set a new MC Bootstrap
- bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
+ // Create and set an embedded JCA instance
+ embedded = new EmbeddedJCA(false);
+ // Startup
+ embedded.startup();
+
// Deploy Naming, Transaction and WorkManager
- bootstrap.deploy(ManageThreadTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- bootstrap.deploy(ManageThreadTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.deploy(ManageThreadTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.deploy(ManageThreadTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.deploy(ManageThreadTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.deploy(ManageThreadTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
}
/**
@@ -122,14 +124,14 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- bootstrap.undeploy(ManageThreadTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
- bootstrap.undeploy(ManageThreadTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.undeploy(ManageThreadTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.undeploy(ManageThreadTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.undeploy(ManageThreadTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.undeploy(ManageThreadTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- // Shutdown MC
- bootstrap.shutdown();
+ // Shutdown embedded
+ embedded.shutdown();
- // Set Bootstrap to null
- bootstrap = null;
+ // Set embedded to null
+ embedded = null;
}
}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkInterfaceTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkInterfaceTestCase.java 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkInterfaceTestCase.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.test.core.spec.chapter10.section3;
+import org.jboss.jca.embedded.EmbeddedJCA;
import org.jboss.jca.test.core.spec.chapter10.common.LongRunningWork;
import org.jboss.jca.test.core.spec.chapter10.common.ShortRunningWork;
import org.jboss.jca.test.core.spec.chapter10.common.SynchronizedWork;
@@ -32,8 +33,6 @@
import javax.resource.spi.work.WorkException;
import javax.resource.spi.work.WorkManager;
-import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -51,9 +50,9 @@
public class WorkInterfaceTestCase
{
/*
- * Bootstrap (MC Facade)
+ * Embedded
*/
- private static EmbeddedTestMcBootstrap bootstrap;
+ private static EmbeddedJCA embedded;
/**
* Test for paragraph 2
@@ -64,7 +63,7 @@
@Test
public void testCallRunMethod() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
ShortRunningWork work = new ShortRunningWork();
assertFalse(work.hasCallRun());
@@ -83,7 +82,7 @@
@Test
public void testCatchAllExceptionAroundRun() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
ShortRunningWork work = new ShortRunningWork();
work.setThrowWorkException(true);
@@ -110,7 +109,7 @@
@Test
public void testCallReleaseMethod() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
ShortRunningWork shortWork = new ShortRunningWork();
workManager.startWork(shortWork);
@@ -134,7 +133,7 @@
@Test
public void testCallReleaseWithOtherThread() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -167,7 +166,7 @@
@Test
public void testCannotDeclaredSynchronizedSynchronizedWork() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
try
{
@@ -190,7 +189,7 @@
@Test
public void testCannotDeclaredSynchronizedUnsynchronizedWork() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
UnsynchronizedWork usw = new UnsynchronizedWork();
workManager.doWork(usw);
@@ -206,13 +205,16 @@
@BeforeClass
public static void beforeClass() throws Throwable
{
- // Create and set a new MC Bootstrap
- bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
+ // Create and set an embedded JCA instance
+ embedded = new EmbeddedJCA(false);
+ // Startup
+ embedded.startup();
+
// Deploy Naming, Transaction and WorkManager
- bootstrap.deploy(WorkInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- bootstrap.deploy(WorkInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.deploy(WorkInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.deploy(WorkInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.deploy(WorkInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.deploy(WorkInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
}
/**
@@ -223,15 +225,15 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- bootstrap.undeploy(WorkInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
- bootstrap.undeploy(WorkInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.undeploy(WorkInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.undeploy(WorkInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.undeploy(WorkInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.undeploy(WorkInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
// Shutdown MC
- bootstrap.shutdown();
+ embedded.shutdown();
- // Set Bootstrap to null
- bootstrap = null;
+ // Set Embedded to null
+ embedded = null;
}
}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkListenerInterfaceTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkListenerInterfaceTestCase.java 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkListenerInterfaceTestCase.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.test.core.spec.chapter10.section3;
+import org.jboss.jca.embedded.EmbeddedJCA;
import org.jboss.jca.test.core.spec.chapter10.common.CallbackCount;
import org.jboss.jca.test.core.spec.chapter10.common.LongRunningWork;
import org.jboss.jca.test.core.spec.chapter10.common.MyWorkAdapter;
@@ -31,8 +32,6 @@
import javax.resource.spi.work.Work;
import javax.resource.spi.work.WorkManager;
-import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -50,9 +49,9 @@
public class WorkListenerInterfaceTestCase
{
/*
- * Bootstrap (MC Facade)
+ * Embedded
*/
- private static EmbeddedTestMcBootstrap bootstrap;
+ private static EmbeddedJCA embedded;
/**
* Test for paragraph 1 Section 3.3.1
@@ -70,7 +69,7 @@
@Test
public void testWorkAcceptedStatus() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
Work work1 = new ShortRunningWork();
Work work2 = new ShortRunningWork();
@@ -103,7 +102,7 @@
@Test
public void testWorkStartedStatus() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
@@ -136,7 +135,7 @@
@Test
public void testWorkCompletedStatus() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start2 = new CountDownLatch(1);
final CountDownLatch done2 = new CountDownLatch(1);
@@ -186,7 +185,7 @@
@Test
public void testSourceObjectIsInitial() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
Work work = new ShortRunningWork();
MyWorkAdapter wa = new MyWorkAdapter();
@@ -203,7 +202,7 @@
@Test
public void testHandleAssociatedWork() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
Work work = new ShortRunningWork();
MyWorkAdapter wa = new MyWorkAdapter();
@@ -220,7 +219,7 @@
@Test
public void testStartDelayDuration() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
Work work = new ShortRunningWork();
MyWorkAdapter wa = new MyWorkAdapter();
@@ -261,7 +260,7 @@
@Test
public void testNotificationWithoutOrder() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
Work work1 = new ShortRunningWork();
Work work2 = new ShortRunningWork();
@@ -292,13 +291,16 @@
@BeforeClass
public static void beforeClass() throws Throwable
{
- // Create and set a new MC Bootstrap
- bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
+ // Create and set an embedded JCA instance
+ embedded = new EmbeddedJCA(false);
+ // Startup
+ embedded.startup();
+
// Deploy Naming, Transaction and WorkManager
- bootstrap.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- bootstrap.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
}
/**
@@ -309,14 +311,14 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- bootstrap.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
- bootstrap.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
// Shutdown MC
- bootstrap.shutdown();
+ embedded.shutdown();
- // Set Bootstrap to null
- bootstrap = null;
+ // Set Embedded to null
+ embedded = null;
}
}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagementModelTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagementModelTestCase.java 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagementModelTestCase.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.test.core.spec.chapter10.section3;
+import org.jboss.jca.embedded.EmbeddedJCA;
import org.jboss.jca.test.core.spec.chapter10.common.LongRunningWork;
import org.jboss.jca.test.core.spec.chapter10.common.PriorityWork;
@@ -32,8 +33,6 @@
import javax.resource.spi.work.WorkManager;
-import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -52,9 +51,9 @@
public class WorkManagementModelTestCase
{
/*
- * Bootstrap (MC Facade)
+ * Embedded
*/
- private static EmbeddedTestMcBootstrap bootstrap;
+ private static EmbeddedJCA embedded;
/**
* Test for paragraph 1
@@ -65,8 +64,9 @@
@Test
public void testGetWorkManagerFromBootstrapConext() throws Throwable
{
- BootstrapContext bootstrapContext = bootstrap.lookup("SimpleBootstrapContext", BootstrapContext.class);
+ BootstrapContext bootstrapContext = embedded.lookup("SimpleBootstrapContext", BootstrapContext.class);
+ assertNotNull(bootstrapContext);
assertNotNull(bootstrapContext.getWorkManager());
}
@@ -80,7 +80,7 @@
@Test
public void testOneThreadPickWorkInstance() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
CountDownLatch start = new CountDownLatch(1);
CountDownLatch done = new CountDownLatch(2);
@@ -109,7 +109,7 @@
@Test
public void testManyWorkInstancesSubmitted() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start1 = new CountDownLatch(1);
final CountDownLatch done1 = new CountDownLatch(1);
@@ -149,7 +149,7 @@
@Test
public void testAnytimeWorkInstanceSubmitted() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch start1 = new CountDownLatch(1);
final CountDownLatch done1 = new CountDownLatch(1);
@@ -193,8 +193,8 @@
{
//TODO
/*
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
- ThreadPoolImpl tpImpl = (ThreadPoolImpl)bootstrap.lookup("WorkManagerThreadPool", ThreadPool.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
+ ThreadPoolImpl tpImpl = (ThreadPoolImpl)embedded.lookup("WorkManagerThreadPool", ThreadPool.class);
int poolNum = tpImpl.getPoolNumber();
int poolSize = tpImpl.getPoolSize();
@@ -242,7 +242,7 @@
@Test
public void testAsUseThreadSamePriorityLevel() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
List<PriorityWork> listWorks = new ArrayList<PriorityWork>();
@@ -279,16 +279,19 @@
@BeforeClass
public static void beforeClass() throws Throwable
{
- // Create and set a new MC Bootstrap
- bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
+ // Create and set an embedded JCA instance
+ embedded = new EmbeddedJCA(false);
+ // Startup
+ embedded.startup();
+
// Deploy Naming, Transaction and WorkManager
- bootstrap.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- bootstrap.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
-
+ embedded.deploy(WorkManagementModelTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.deploy(WorkManagementModelTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.deploy(WorkManagementModelTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+
// Deploy Beans
- bootstrap.deploy(WorkManagerInterfaceTestCase.class);
+ embedded.deploy(WorkManagementModelTestCase.class);
}
/**
@@ -298,18 +301,18 @@
@AfterClass
public static void afterClass() throws Throwable
{
+ // Undeploy Beans
+ embedded.undeploy(WorkManagementModelTestCase.class);
+
// Undeploy WorkManager, Transaction and Naming
- bootstrap.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
- bootstrap.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.undeploy(WorkManagementModelTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.undeploy(WorkManagementModelTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.undeploy(WorkManagementModelTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- // Undeploy Beans
- bootstrap.undeploy(WorkManagerInterfaceTestCase.class);
-
// Shutdown MC
- bootstrap.shutdown();
+ embedded.shutdown();
- // Set Bootstrap to null
- bootstrap = null;
+ // Set Embedded to null
+ embedded = null;
}
}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase.java 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.test.core.spec.chapter10.section3;
+import org.jboss.jca.embedded.EmbeddedJCA;
import org.jboss.jca.test.core.spec.chapter10.common.BlockRunningWork;
import org.jboss.jca.test.core.spec.chapter10.common.NestCharWork;
@@ -30,8 +31,6 @@
import javax.resource.spi.work.WorkManager;
-import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -49,11 +48,10 @@
public class WorkManagerInterfaceTestCase
{
/*
- * Bootstrap (MC Facade)
+ * Embedded
*/
- private static EmbeddedTestMcBootstrap bootstrap;
+ private static EmbeddedJCA embedded;
-
/**
* Test for paragraph 1
* WorkManager instance can be obtained by calling the getWorkManager method of the BootstrapContext instance.
@@ -63,7 +61,7 @@
public void testGetWorkManagerFromBootstrapConext() throws Throwable
{
- BootstrapContext bootstrapContext = bootstrap.lookup("SimpleBootstrapContext", BootstrapContext.class);
+ BootstrapContext bootstrapContext = embedded.lookup("SimpleBootstrapContext", BootstrapContext.class);
assertNotNull(bootstrapContext.getWorkManager());
}
@@ -76,7 +74,7 @@
@Test
public void testDoWorkMethod() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch before = new CountDownLatch(1);
final CountDownLatch hold = new CountDownLatch(1);
@@ -107,7 +105,7 @@
@Test
public void testFifoStartLifoFinish() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch startA = new CountDownLatch(1);
final CountDownLatch doneA = new CountDownLatch(1);
NestCharWork workA = new NestCharWork("A", startA, doneA);
@@ -139,7 +137,7 @@
@Test
public void testStartWorkMethod() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch before = new CountDownLatch(1);
final CountDownLatch hold = new CountDownLatch(1);
@@ -197,7 +195,7 @@
@Test
public void testFifoStart() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch startA = new CountDownLatch(1);
final CountDownLatch doneA = new CountDownLatch(1);
NestCharWork workA = new NestCharWork("A", startA, doneA);
@@ -229,7 +227,7 @@
@Test
public void testScheduleWorkMethod() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch before = new CountDownLatch(1);
final CountDownLatch hold = new CountDownLatch(1);
@@ -262,7 +260,7 @@
@Test
public void testAsImplementWorkManagerInterface() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
assertNotNull(workManager);
}
@@ -274,7 +272,7 @@
@Test
public void testAllowNestedWork() throws Throwable
{
- WorkManager workManager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager workManager = embedded.lookup("WorkManager", WorkManager.class);
final CountDownLatch startA = new CountDownLatch(1);
final CountDownLatch doneA = new CountDownLatch(1);
NestCharWork workA = new NestCharWork("A", startA, doneA);
@@ -319,16 +317,19 @@
@BeforeClass
public static void beforeClass() throws Throwable
{
- // Create and set a new MC Bootstrap
- bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
+ // Create and set an embedded JCA instance
+ embedded = new EmbeddedJCA(false);
+ // Startup
+ embedded.startup();
+
// Deploy Naming, Transaction and WorkManager
- bootstrap.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- bootstrap.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
-
+ embedded.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+
// Deploy Beans
- bootstrap.deploy(WorkManagerInterfaceTestCase.class);
+ embedded.deploy(WorkManagerInterfaceTestCase.class);
}
/**
@@ -338,19 +339,19 @@
@AfterClass
public static void afterClass() throws Throwable
{
+ // Undeploy Beans
+ embedded.deploy(WorkManagerInterfaceTestCase.class);
+
// Undeploy WorkManager, Transaction and Naming
- bootstrap.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
- bootstrap.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- // Undeploy Beans
- bootstrap.undeploy(WorkManagerInterfaceTestCase.class);
+ // Shutdown
+ embedded.shutdown();
- // Shutdown MC
- bootstrap.shutdown();
-
- // Set Bootstrap to null
- bootstrap = null;
+ // Set embedded to null
+ embedded = null;
}
}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/api/WorkContextProviderGetWorkContextsTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/api/WorkContextProviderGetWorkContextsTestCase.java 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/api/WorkContextProviderGetWorkContextsTestCase.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -22,10 +22,9 @@
package org.jboss.jca.test.core.spec.chapter11.api;
+import org.jboss.jca.embedded.EmbeddedJCA;
import org.jboss.jca.test.core.spec.chapter11.section4.subsection3.WorkContextHandlingAssignmentTestCase;
-import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
-
import junit.framework.Assert;
import org.junit.AfterClass;
@@ -41,7 +40,10 @@
*/
public class WorkContextProviderGetWorkContextsTestCase
{
- private static EmbeddedTestMcBootstrap bootstrap = null;
+ /*
+ * Embedded
+ */
+ private static EmbeddedJCA embedded;
/**
* Test api for {@link WorkContextProvider#getWorkContexts()}
@@ -58,29 +60,35 @@
/**
* Before class.
+ * @throws Throwable throwable exception
*/
@BeforeClass
- public static void beforeClass()
+ public static void beforeClass() throws Throwable
{
- bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
+ // Create and set an embedded JCA instance
+ embedded = new EmbeddedJCA(false);
+ // Startup
+ embedded.startup();
+
// Deploy Naming, Transaction and WorkManager
- bootstrap.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- bootstrap.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
}
/**
* After class.
+ * @throws Throwable throwable exception
*/
@AfterClass
- public static void afterClass()
+ public static void afterClass() throws Throwable
{
- bootstrap.undeploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
- bootstrap.shutdown();
+ embedded.undeploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.shutdown();
- bootstrap = null;
+ embedded = null;
}
}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/section4/subsection3/WorkContextHandlingAssignmentTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/section4/subsection3/WorkContextHandlingAssignmentTestCase.java 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/section4/subsection3/WorkContextHandlingAssignmentTestCase.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -22,6 +22,7 @@
package org.jboss.jca.test.core.spec.chapter11.section4.subsection3;
+import org.jboss.jca.embedded.EmbeddedJCA;
import org.jboss.jca.test.core.spec.chapter11.common.DuplicateHintContextWork;
import org.jboss.jca.test.core.spec.chapter11.common.DuplicateSecurityContextWork;
import org.jboss.jca.test.core.spec.chapter11.common.DuplicateTransactionContextWork;
@@ -30,8 +31,6 @@
import javax.resource.spi.work.WorkCompletedException;
import javax.resource.spi.work.WorkManager;
-import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -43,7 +42,10 @@
*/
public class WorkContextHandlingAssignmentTestCase
{
- private static EmbeddedTestMcBootstrap bootstrap = null;
+ /*
+ * Embedded
+ */
+ private static EmbeddedJCA embedded;
/**
* Test unsupported context.
@@ -52,7 +54,7 @@
@Test(expected = WorkCompletedException.class)
public void testUnsupportedType() throws Throwable
{
- WorkManager manager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager manager = embedded.lookup("WorkManager", WorkManager.class);
manager.doWork(new UnsupportedWork());
}
@@ -63,7 +65,7 @@
@Test(expected = WorkCompletedException.class)
public void testTransactionContextDuplicate() throws Throwable
{
- WorkManager manager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager manager = embedded.lookup("WorkManager", WorkManager.class);
manager.doWork(new DuplicateTransactionContextWork());
}
@@ -74,7 +76,7 @@
@Test(expected = WorkCompletedException.class)
public void testSecurityContextDuplicate() throws Throwable
{
- WorkManager manager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager manager = embedded.lookup("WorkManager", WorkManager.class);
manager.doWork(new DuplicateSecurityContextWork());
}
@@ -85,36 +87,42 @@
@Test(expected = WorkCompletedException.class)
public void testHintContextDuplicate() throws Throwable
{
- WorkManager manager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager manager = embedded.lookup("WorkManager", WorkManager.class);
manager.doWork(new DuplicateHintContextWork());
}
/**
* Before class.
+ * @throws Throwable throwable exception
*/
@BeforeClass
- public static void beforeClass()
+ public static void beforeClass() throws Throwable
{
- bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
+ // Create and set an embedded JCA instance
+ embedded = new EmbeddedJCA(false);
+ // Startup
+ embedded.startup();
+
// Deploy Naming, Transaction and WorkManager
- bootstrap.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- bootstrap.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
}
/**
* After class.
+ * @throws Throwable throwable exception
*/
@AfterClass
- public static void afterClass()
+ public static void afterClass() throws Throwable
{
- bootstrap.undeploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
- bootstrap.undeploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.undeploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- bootstrap.shutdown();
+ embedded.undeploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.undeploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.undeploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.shutdown();
- bootstrap = null;
+ embedded = null;
}
}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/section5/TransactionContextTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/section5/TransactionContextTestCase.java 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/section5/TransactionContextTestCase.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -22,6 +22,7 @@
package org.jboss.jca.test.core.spec.chapter11.section5;
+import org.jboss.jca.embedded.EmbeddedJCA;
import org.jboss.jca.test.core.spec.chapter11.common.TransactionContextWork;
import org.jboss.jca.test.core.spec.chapter11.section4.subsection3.WorkContextHandlingAssignmentTestCase;
@@ -29,8 +30,6 @@
import javax.resource.spi.work.WorkManager;
import javax.resource.spi.work.WorkRejectedException;
-import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -42,7 +41,10 @@
*/
public class TransactionContextTestCase
{
- private static EmbeddedTestMcBootstrap bootstrap = null;
+ /*
+ * Embedded
+ */
+ private static EmbeddedJCA embedded;
/**
* Test whether or not work contains both execution context and implement {@link WorkContextProvider}.
@@ -51,38 +53,44 @@
@Test(expected = WorkRejectedException.class)
public void testNotBothExecutionContext() throws Throwable
{
- WorkManager manager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager manager = embedded.lookup("WorkManager", WorkManager.class);
manager.doWork(new TransactionContextWork(), WorkManager.INDEFINITE, new ExecutionContext(), null);
}
/**
* Before class.
+ * @throws Throwable throwable exception
*/
@BeforeClass
- public static void beforeClass()
+ public static void beforeClass() throws Throwable
{
- bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
+ // Create and set an embedded JCA instance
+ embedded = new EmbeddedJCA(false);
+ // Startup
+ embedded.startup();
+
// Deploy Naming, Transaction and WorkManager
- bootstrap.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- bootstrap.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
}
/**
* After class.
+ * @throws Throwable throwable exception
*/
@AfterClass
- public static void afterClass()
+ public static void afterClass() throws Throwable
{
- bootstrap.undeploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
- bootstrap.undeploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.undeploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- bootstrap.shutdown();
+ embedded.undeploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.undeploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.undeploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.shutdown();
- bootstrap = null;
+ embedded = null;
}
}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/section7/WorkContextSetupListenerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/section7/WorkContextSetupListenerTestCase.java 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/section7/WorkContextSetupListenerTestCase.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -22,6 +22,7 @@
package org.jboss.jca.test.core.spec.chapter11.section7;
+import org.jboss.jca.embedded.EmbeddedJCA;
import org.jboss.jca.test.core.spec.chapter11.common.DuplicateTransactionContextWork;
import org.jboss.jca.test.core.spec.chapter11.common.TransactionContextCustom;
import org.jboss.jca.test.core.spec.chapter11.common.TransactionContextWork;
@@ -30,8 +31,6 @@
import javax.resource.spi.work.WorkContextErrorCodes;
import javax.resource.spi.work.WorkManager;
-import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
-
import junit.framework.Assert;
import org.junit.AfterClass;
@@ -46,8 +45,10 @@
*/
public class WorkContextSetupListenerTestCase
{
- /** Embedded bootstrap */
- private static EmbeddedTestMcBootstrap bootstrap = null;
+ /*
+ * Embedded
+ */
+ private static EmbeddedJCA embedded;
/**
* Test {@link WorkContextLifecycleListener} for transaction context.
@@ -57,7 +58,7 @@
@Test
public void testTransactionContextCustomListener() throws Throwable
{
- WorkManager manager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager manager = embedded.lookup("WorkManager", WorkManager.class);
manager.doWork(new TransactionContextWork(), WorkManager.INDEFINITE, null, null);
String errorCode = TransactionContextCustom.getContextSetupFailedErrorCode();
@@ -76,7 +77,7 @@
@Test
public void testTransactionContextFailedListener() throws Throwable
{
- WorkManager manager = bootstrap.lookup("WorkManager", WorkManager.class);
+ WorkManager manager = embedded.lookup("WorkManager", WorkManager.class);
try
{
manager.doWork(new DuplicateTransactionContextWork(), WorkManager.INDEFINITE, null, null);
@@ -97,31 +98,37 @@
/**
* Before class.
+ * @throws Throwable throwable exception
*/
@BeforeClass
- public static void beforeClass()
+ public static void beforeClass() throws Throwable
{
- bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
+ // Create and set an embedded JCA instance
+ embedded = new EmbeddedJCA(false);
+ // Startup
+ embedded.startup();
+
// Deploy Naming, Transaction and WorkManager
- bootstrap.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- bootstrap.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.deploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
}
/**
* After class.
+ * @throws Throwable throwable exception
*/
@AfterClass
- public static void afterClass()
+ public static void afterClass() throws Throwable
{
- bootstrap.undeploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
- bootstrap.undeploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.undeploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- bootstrap.shutdown();
+ embedded.undeploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.undeploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.undeploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.shutdown();
- bootstrap = null;
+ embedded = null;
}
}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/workmanager/unit/WorkManagerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/workmanager/unit/WorkManagerTestCase.java 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/workmanager/unit/WorkManagerTestCase.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -22,7 +22,8 @@
package org.jboss.jca.test.core.workmanager.unit;
-import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
+import org.jboss.jca.embedded.EmbeddedJCA;
+
import org.jboss.logging.Logger;
import org.junit.AfterClass;
@@ -48,9 +49,9 @@
private static final Logger LOG = Logger.getLogger(WorkManagerTestCase.class);
/*
- * Bootstrap (MC Facade)
+ * Embedded
*/
- private static EmbeddedTestMcBootstrap bootstrap;
+ private static EmbeddedJCA embedded;
// --------------------------------------------------------------------------------||
// Tests --------------------------------------------------------------------------||
@@ -65,8 +66,9 @@
public void testInstanceOf() throws Throwable
{
org.jboss.jca.core.api.WorkManager workManager =
- bootstrap.lookup("WorkManager", org.jboss.jca.core.api.WorkManager.class);
+ embedded.lookup("WorkManager", org.jboss.jca.core.api.WorkManager.class);
+ assertNotNull(workManager);
assertTrue(workManager instanceof javax.resource.spi.work.WorkManager);
}
@@ -78,8 +80,9 @@
public void testThreadPool() throws Throwable
{
org.jboss.jca.core.api.WorkManager workManager =
- bootstrap.lookup("WorkManager", org.jboss.jca.core.api.WorkManager.class);
+ embedded.lookup("WorkManager", org.jboss.jca.core.api.WorkManager.class);
+ assertNotNull(workManager);
assertNotNull(workManager.getThreadPool());
assertTrue(workManager.getThreadPool() instanceof org.jboss.jca.common.api.ThreadPool);
}
@@ -92,8 +95,9 @@
public void testXATerminator() throws Throwable
{
org.jboss.jca.core.api.WorkManager workManager =
- bootstrap.lookup("WorkManager", org.jboss.jca.core.api.WorkManager.class);
+ embedded.lookup("WorkManager", org.jboss.jca.core.api.WorkManager.class);
+ assertNotNull(workManager);
assertNotNull(workManager.getXATerminator());
assertTrue(workManager.getXATerminator() instanceof org.jboss.tm.JBossXATerminator);
}
@@ -109,13 +113,16 @@
@BeforeClass
public static void beforeClass() throws Throwable
{
- // Create and set a new MC Bootstrap
- bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
+ // Create and set an embedded JCA instance
+ embedded = new EmbeddedJCA(false);
+ // Startup
+ embedded.startup();
+
// Deploy Naming, Transaction and WorkManager
- bootstrap.deploy(WorkManagerTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- bootstrap.deploy(WorkManagerTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.deploy(WorkManagerTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.deploy(WorkManagerTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.deploy(WorkManagerTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.deploy(WorkManagerTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
}
/**
@@ -126,14 +133,14 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- bootstrap.undeploy(WorkManagerTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
- bootstrap.undeploy(WorkManagerTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- bootstrap.undeploy(WorkManagerTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ embedded.undeploy(WorkManagerTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ embedded.undeploy(WorkManagerTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ embedded.undeploy(WorkManagerTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- // Shutdown MC
- bootstrap.shutdown();
+ // Shutdown embedded
+ embedded.shutdown();
- // Set Bootstrap to null
- bootstrap = null;
+ // Set embedded to null
+ embedded = null;
}
}
Modified: projects/jboss-jca/trunk/core/src/test/resources/mdr-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/mdr-jboss-beans.xml 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/resources/mdr-jboss-beans.xml 2009-09-11 19:34:44 UTC (rev 93431)
@@ -3,7 +3,7 @@
<!--
JBoss JCA
-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<deployment>
<bean name="MetaDataRepository" interface="org.jboss.jca.core.api.MetaDataRepository" class="org.jboss.jca.core.mdr.MetaDataRepositoryImpl">
</bean>
Modified: projects/jboss-jca/trunk/core/src/test/resources/naming-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/naming-jboss-beans.xml 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/resources/naming-jboss-beans.xml 2009-09-11 19:34:44 UTC (rev 93431)
@@ -3,7 +3,7 @@
<!--
JBoss JCA
-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<deployment>
<!-- Naming -->
<bean name="NamingServer" class="org.jnp.server.SingletonNamingServer"/>
Modified: projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagementModelTestCase-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagementModelTestCase-jboss-beans.xml 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagementModelTestCase-jboss-beans.xml 2009-09-11 19:34:44 UTC (rev 93431)
@@ -3,7 +3,7 @@
<!--
JBoss JCA
-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<deployment>
<bean name="SimpleBootstrapContext" interface="javax.resource.spi.BootstrapContext" class="org.jboss.jca.test.core.spec.chapter10.SimpleBootstrapContext">
<!-- The work manager -->
Modified: projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase-jboss-beans.xml 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase-jboss-beans.xml 2009-09-11 19:34:44 UTC (rev 93431)
@@ -3,7 +3,7 @@
<!--
JBoss JCA
-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<deployment>
<bean name="SimpleBootstrapContext" interface="javax.resource.spi.BootstrapContext" class="org.jboss.jca.test.core.spec.chapter10.SimpleBootstrapContext">
<!-- The work manager -->
Modified: projects/jboss-jca/trunk/core/src/test/resources/transaction-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/transaction-jboss-beans.xml 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/resources/transaction-jboss-beans.xml 2009-09-11 19:34:44 UTC (rev 93431)
@@ -3,7 +3,7 @@
<!--
JBoss JCA
-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<deployment>
<!-- JMX -->
<bean name="JMX" class="org.jboss.jca.test.core.common.JMX"/>
Modified: projects/jboss-jca/trunk/core/src/test/resources/workmanager-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/workmanager-jboss-beans.xml 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/core/src/test/resources/workmanager-jboss-beans.xml 2009-09-11 19:34:44 UTC (rev 93431)
@@ -3,7 +3,7 @@
<!--
JBoss JCA
-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<deployment>
<bean name="WorkManagerThreadPool" interface="org.jboss.jca.common.api.ThreadPool" class="org.jboss.jca.common.threadpool.ThreadPoolImpl">
<!-- The name that appears in thread names -->
Added: projects/jboss-jca/trunk/embedded/.classpath
===================================================================
--- projects/jboss-jca/trunk/embedded/.classpath (rev 0)
+++ projects/jboss-jca/trunk/embedded/.classpath 2009-09-11 19:34:44 UTC (rev 93431)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="eclipse-target/tests-classes" path="src/test/java"/>
+ <classpathentry excluding="**/*.java" kind="src" output="eclipse-target/tests-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-api"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-common"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/metadata-rar"/>
+ <classpathentry kind="output" path="eclipse-target/classes"/>
+</classpath>
Added: projects/jboss-jca/trunk/embedded/.project
===================================================================
--- projects/jboss-jca/trunk/embedded/.project (rev 0)
+++ projects/jboss-jca/trunk/embedded/.project 2009-09-11 19:34:44 UTC (rev 93431)
@@ -0,0 +1,17 @@
+<projectDescription>
+ <name>jboss-jca-sjc</name>
+ <comment>JBoss JCA Simple Container</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: projects/jboss-jca/trunk/embedded/build.xml
===================================================================
--- projects/jboss-jca/trunk/embedded/build.xml (rev 0)
+++ projects/jboss-jca/trunk/embedded/build.xml 2009-09-11 19:34:44 UTC (rev 93431)
@@ -0,0 +1,86 @@
+<!--
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
+<project name="jboss-jca-embedded"
+ default="compile"
+ xmlns:ivy="antlib:org.apache.ivy.ant">
+
+ <!-- =================================
+ Properties
+ ================================= -->
+ <property name="build.embedded.dir" value="${build.dir}/embedded" />
+
+ <!-- =================================
+ Target: init
+ ================================= -->
+ <target name="init">
+ <mkdir dir="${build.embedded.dir}" />
+ <mkdir dir="${build.embedded.dir}/impl" />
+ </target>
+
+ <!-- =================================
+ Target: compile
+ ================================= -->
+ <target name="compile" depends="init">
+ <javac srcdir="src/main"
+ destdir="${build.embedded.dir}/impl"
+ classpathref="sjc.lib.path.id"
+ debug="${javac.debug}"
+ deprecation="${javac.deprecation}"
+ optimize="${javac.optimize}">
+ <compilerarg value="-Xlint"/>
+ </javac>
+ </target>
+
+ <!-- =================================
+ Target: jars
+ ================================= -->
+ <target name="jars" depends="compile">
+ <copy todir="${build.embedded.dir}/impl">
+ <fileset dir="src/main/resources"
+ includes="*.xml"/>
+ </copy>
+ <jar destfile="${target.dir}/jboss-jca-embedded.jar"
+ manifest="src/main/resources/embedded-manifest.mf"
+ basedir="${build.embedded.dir}/impl"
+ excludes="**/*.java"/>
+ </target>
+
+ <!-- =================================
+ Target: docs
+ ================================= -->
+ <target name="docs">
+ <mkdir dir="${target.dir}/docs/embedded"/>
+ <javadoc packagenames="org.*"
+ sourcepath="src/main/java"
+ destdir="${target.dir}/docs/embedded"
+ author="true"
+ version="true"
+ windowtitle="JBoss JCA Embedded"
+ doctitle="JBoss JCA Embedded"
+ use="true"
+ classpathref="sjc.lib.path.id"
+ bottom="Copyright © 2008-2009 Red Hat Middleware LLC (http://www.jboss.com/)">
+ <link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
+ </javadoc>
+ </target>
+
+</project>
Added: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java (rev 0)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -0,0 +1,194 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.jca.embedded;
+
+import org.jboss.jca.fungal.impl.KernelConfiguration;
+import org.jboss.jca.fungal.impl.KernelImpl;
+
+import java.net.URL;
+
+/**
+ * The embedded JBoss JCA container
+ * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
+ */
+public class EmbeddedJCA
+{
+ /** Enable full profile */
+ private boolean fullProfile;
+
+ /** Kernel */
+ private KernelImpl kernel;
+
+ /**
+ * Constructs an embedded JCA environment using
+ * the full JCA 1.6 profile
+ */
+ public EmbeddedJCA()
+ {
+ this(true);
+ }
+
+ /**
+ * Constructs an embedded JCA environment. If <code>fullProfile</code>
+ * is <code>true</code> then a full JCA 1.6 container is initialized -
+ * otherwise only the basic kernel is initialized and services has
+ * to be added as deployments
+ * @param fullProfile Should a full profile be initialized
+ */
+ public EmbeddedJCA(boolean fullProfile)
+ {
+ this.fullProfile = fullProfile;
+ }
+
+ /**
+ * Startup
+ * @exception Throwable If an error occurs
+ */
+ public void startup() throws Throwable
+ {
+ KernelConfiguration kernelConfiguration = new KernelConfiguration();
+ kernel = new KernelImpl(kernelConfiguration);
+ kernel.startup();
+
+ if (fullProfile)
+ {
+ deploy(EmbeddedJCA.class.getClassLoader(), "naming.xml");
+ deploy(EmbeddedJCA.class.getClassLoader(), "transaction.xml");
+ deploy(EmbeddedJCA.class.getClassLoader(), "jca.xml");
+ }
+ }
+
+ /**
+ * Shutdown
+ * @exception Throwable If an error occurs
+ */
+ public void shutdown() throws Throwable
+ {
+ kernel.shutdown();
+ }
+
+ /**
+ * Lookup a bean
+ * @param name The bean name
+ * @param expectedType The expected type for the bean
+ * @return The bean instance
+ * @exception Throwable If an error occurs
+ */
+ public <T> T lookup(String name, Class<T> expectedType) throws Throwable
+ {
+ if (name == null)
+ throw new IllegalArgumentException("Name is null");
+
+ if (expectedType == null)
+ throw new IllegalArgumentException("ExpectedType is null");
+
+ return expectedType.cast(kernel.getBean(name));
+ }
+
+ /**
+ * Deploy
+ * @param url The resource url
+ * @exception Throwable If an error occurs
+ */
+ public void deploy(URL url) throws Throwable
+ {
+ if (url == null)
+ throw new IllegalArgumentException("Url is null");
+
+ kernel.getMainDeployer().deploy(url);
+ }
+
+ /**
+ * Deploy
+ * @param cl The class loader
+ * @param name The resource name
+ * @exception Throwable If an error occurs
+ */
+ public void deploy(ClassLoader cl, String name) throws Throwable
+ {
+ if (cl == null)
+ throw new IllegalArgumentException("ClassLoader is null");
+
+ if (name == null)
+ throw new IllegalArgumentException("Name is null");
+
+ URL url = cl.getResource(name);
+ kernel.getMainDeployer().deploy(url);
+ }
+
+ /**
+ * Deploy
+ * @param clz The class
+ * @exception Throwable If an error occurs
+ */
+ public void deploy(Class<?> clz) throws Throwable
+ {
+ if (clz == null)
+ throw new IllegalArgumentException("Clz is null");
+
+ String name = clz.getName().replace('.', '/');
+ name += "-jboss-beans.xml";
+
+ URL url = clz.getClassLoader().getResource(name);
+ kernel.getMainDeployer().deploy(url);
+ }
+
+ /**
+ * Undeploy
+ * @param url The resource url
+ * @exception Throwable If an error occurs
+ */
+ public void undeploy(URL url) throws Throwable
+ {
+ if (url == null)
+ throw new IllegalArgumentException("Url is null");
+
+ }
+
+ /**
+ * Undeploy
+ * @param cl The class loader
+ * @param name The resource name
+ * @exception Throwable If an error occurs
+ */
+ public void undeploy(ClassLoader cl, String name) throws Throwable
+ {
+ if (cl == null)
+ throw new IllegalArgumentException("ClassLoader is null");
+
+ if (name == null)
+ throw new IllegalArgumentException("Name is null");
+
+ }
+
+ /**
+ * Undeploy
+ * @param clz The class
+ * @exception Throwable If an error occurs
+ */
+ public void undeploy(Class<?> clz) throws Throwable
+ {
+ if (clz == null)
+ throw new IllegalArgumentException("Clz is null");
+ }
+}
Added: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/SecurityActions.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/SecurityActions.java (rev 0)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/SecurityActions.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -0,0 +1,139 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008-2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.jca.embedded;
+
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Properties;
+
+/**
+ * Privileged Blocks
+ * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
+ */
+class SecurityActions
+{
+ /**
+ * Constructor
+ */
+ private SecurityActions()
+ {
+ }
+
+ /**
+ * Get the thread context class loader
+ * @return The class loader
+ */
+ static ClassLoader getThreadContextClassLoader()
+ {
+ return (ClassLoader)AccessController.doPrivileged(new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+
+ /**
+ * Set the thread context class loader
+ * @param cl The class loader
+ */
+ static void setThreadContextClassLoader(final ClassLoader cl)
+ {
+ AccessController.doPrivileged(new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ Thread.currentThread().setContextClassLoader(cl);
+ return null;
+ }
+ });
+ }
+
+ /**
+ * Get the system properties
+ * @return The properties
+ */
+ static Properties getSystemProperties()
+ {
+ return (Properties)AccessController.doPrivileged(new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ return System.getProperties();
+ }
+ });
+ }
+
+ /**
+ * Get a system property
+ * @param name The property name
+ * @return The property value
+ */
+ static String getSystemProperty(final String name)
+ {
+ return (String)AccessController.doPrivileged(new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ return System.getProperty(name);
+ }
+ });
+ }
+
+ /**
+ * Set a system property
+ * @param name The property name
+ * @param value The property value
+ */
+ static void setSystemProperty(final String name, final String value)
+ {
+ AccessController.doPrivileged(new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ System.setProperty(name, value);
+ return null;
+ }
+ });
+ }
+
+ /**
+ * Create an URLClassLoader
+ * @param urls The urls
+ * @param parent The parent class loader
+ * @return The class loader
+ */
+ static URLClassLoader createURLCLassLoader(final URL[] urls, final ClassLoader parent)
+ {
+ return (URLClassLoader)AccessController.doPrivileged(new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ return new URLClassLoader(urls, parent);
+ }
+ });
+ }
+}
Added: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/package.html
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/package.html (rev 0)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/package.html 2009-09-11 19:34:44 UTC (rev 93431)
@@ -0,0 +1,3 @@
+<body>
+This package contains the Embedded JCA Container which can be used for an in-container JCA implementation as well as unit testing.
+</body>
Added: projects/jboss-jca/trunk/embedded/src/main/resources/embedded-manifest.mf
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/resources/embedded-manifest.mf (rev 0)
+++ projects/jboss-jca/trunk/embedded/src/main/resources/embedded-manifest.mf 2009-09-11 19:34:44 UTC (rev 93431)
@@ -0,0 +1,4 @@
+Implementation-Title: JBoss JCA Embedded
+Implementation-Vendor: Red Hat Middleware LLC
+Implementation-Vendor-Id: org.jboss
+Implementation-Version: 0.1
Added: projects/jboss-jca/trunk/embedded/src/main/resources/jca.xml
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/resources/jca.xml (rev 0)
+++ projects/jboss-jca/trunk/embedded/src/main/resources/jca.xml 2009-09-11 19:34:44 UTC (rev 93431)
@@ -0,0 +1,37 @@
+<deployment>
+
+ <!-- Work Manager thread pool -->
+ <bean name="WorkManagerThreadPool" interface="org.jboss.jca.common.threadpool.ThreadPool" class="org.jboss.jca.common.threadpool.ThreadPoolImpl">
+ <!-- The name that appears in thread names -->
+ <property name="name">WorkManager</property>
+
+ <!-- The maximum amount of work in the queue -->
+ <property name="maximumQueueSize">1024</property>
+
+ <!-- The maximum number of active threads -->
+ <property name="maximumPoolSize">100</property>
+
+ <!-- How long to keep threads alive after their last work (default one minute) -->
+ <property name="keepAliveTime">60000</property>
+ </bean>
+
+ <!-- Work Manager -->
+ <bean name="WorkManager" interface="org.jboss.jca.core.api.WorkManager" class="org.jboss.jca.core.workmanager.WorkManagerImpl">
+ <!-- The thread pool -->
+ <property name="threadPool"><inject bean="WorkManagerThreadPool"/></property>
+
+ <!-- The XA terminator -->
+ <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
+ </bean>
+
+ <!-- Connection Manager -->
+ <bean name="ConnectionManager" interface="org.jboss.jca.core.api.ConnectionManager" class="org.jboss.jca.core.connectionmanager.ConnectionManagerImpl">
+ </bean>
+
+ <!-- RA deployer -->
+ <bean name="RADeployer" interface="org.jboss.jca.fungal.deployers.Deployer" class="org.jboss.jca.deployers.fungal.RADeployer">
+ <depends>ConnectionManager</depends>
+ <depends>WorkManager</depends>
+ </bean>
+
+</deployment>
Added: projects/jboss-jca/trunk/embedded/src/main/resources/naming.xml
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/resources/naming.xml (rev 0)
+++ projects/jboss-jca/trunk/embedded/src/main/resources/naming.xml 2009-09-11 19:34:44 UTC (rev 93431)
@@ -0,0 +1,49 @@
+<deployment>
+
+ <!-- Naming -->
+ <bean name="LookupPool">
+ <constructor factoryMethod="newFixedThreadPool"
+ factoryClass="java.util.concurrent.Executors">
+ <parameter>2</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="NamingBeanImpl" class="org.jnp.server.NamingBeanImpl">
+ <!-- Install this bean as the global JVM NamingServer -->
+ <property name="installGlobalService">true</property>
+
+ <property name="useGlobalService">false</property>
+ </bean>
+
+ <bean name="NamingServer" class="org.jnp.server.Main">
+ <property name="namingInfo"><inject bean="NamingBeanImpl"/></property>
+
+ <!-- The call by value mode. true if all lookups are unmarshalled using
+ the caller's TCL, false if in VM lookups return the value by reference.
+ -->
+ <property name="callByValue">false</property>
+
+ <!-- The listening port for the bootstrap JNP service. Set this to -1
+ to run the NamingService without the JNP invoker listening port.
+ -->
+ <property name="port">1099</property>
+
+ <!-- The bootstrap JNP server bind address. This also sets the default
+ RMI service bind address. Empty == all addresses
+ -->
+ <property name="bindAddress">${jboss.jca.bindaddress:localhost}</property>
+
+ <!-- The port of the RMI naming service, 0 == anonymous -->
+ <property name="rmiPort">0</property>
+
+ <!-- The RMI service bind address. Empty == all addresses -->
+ <property name="rmiBindAddress">${jboss.jca.bindaddress:localhost}</property>
+
+ <!-- Set the java.rmi.server.hostname system property to rmiBindAddress -->
+ <property name="enableRmiServerHostname">true</property>
+
+ <!-- The thread pool service used to control the bootstrap lookups -->
+ <property name="lookupExector"><inject bean="LookupPool"/></property>
+ </bean>
+
+</deployment>
Added: projects/jboss-jca/trunk/embedded/src/main/resources/transaction.xml
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/resources/transaction.xml (rev 0)
+++ projects/jboss-jca/trunk/embedded/src/main/resources/transaction.xml 2009-09-11 19:34:44 UTC (rev 93431)
@@ -0,0 +1,16 @@
+<deployment>
+
+ <!-- Transaction manager -->
+ <bean name="TransactionManager" class="com.arjuna.ats.jbossatx.jta.TransactionManagerService">
+ <property name="transactionTimeout">300</property>
+ <property name="objectStoreDir">${jboss.jca.home}/tmp/tx-object-store</property>
+ <property name="mbeanServer"><inject bean="Kernel" property="MBeanServer"/></property>
+ <property name="transactionStatusManagerInetAddress">localhost</property>
+ <property name="transactionStatusManagerPort">4713</property>
+ <property name="recoveryInetAddress">localhost</property>
+ <property name="recoveryPort">4712</property>
+ <property name="socketProcessIdPort">0</property>
+ <depends>NamingServer</depends>
+ </bean>
+
+</deployment>
Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -110,25 +110,35 @@
{
try
{
- // TODO - remove File dependency
-
- File root = new File(kernelConfiguration.getHome().toURI());
-
- SecurityActions.setSystemProperty("jboss.jca.home", root.getAbsolutePath());
-
- if (kernelConfiguration.getBindAddress() != null)
- SecurityActions.setSystemProperty("jboss.jca.bindaddress", kernelConfiguration.getBindAddress().trim());
-
ThreadGroup tg = kernelConfiguration.getThreadGroup();
if (tg == null)
tg = new ThreadGroup("jboss");
ThreadFactory tf = new FungalThreadFactory(tg);
executorService = Executors.newCachedThreadPool(tf);
- File libDirectory = new File(root, "/lib/");
- File configDirectory = new File(root, "/config/");
- File deployDirectory = new File(root, "/deploy/");
+ File root = null;
+ if (kernelConfiguration.getHome() != null)
+ {
+ root = new File(kernelConfiguration.getHome().toURI());
+ SecurityActions.setSystemProperty("jboss.jca.home", root.getAbsolutePath());
+ }
+ else
+ {
+ // TODO
+ }
+
+ File libDirectory = null;
+ File configDirectory = null;
+ File deployDirectory = null;
+
+ if (root != null)
+ {
+ libDirectory = new File(root, "/lib/");
+ configDirectory = new File(root, "/config/");
+ deployDirectory = new File(root, "/deploy/");
+ }
+
oldClassLoader = SecurityActions.getThreadContextClassLoader();
URL[] libUrls = getUrls(libDirectory);
@@ -140,10 +150,11 @@
SecurityActions.setThreadContextClassLoader(kernelClassLoader);
SecurityActions.setSystemProperty("xb.builder.useUnorderedSequence", "true");
- SecurityActions.setSystemProperty("jboss.deploy.url", deployDirectory.toURI().toURL().toString());
- SecurityActions.setSystemProperty("jboss.lib.url", libDirectory.toURI().toURL().toString());
SecurityActions.setSystemProperty("java.util.logging.manager", "org.jboss.logmanager.LogManager");
+ if (kernelConfiguration.getBindAddress() != null)
+ SecurityActions.setSystemProperty("jboss.jca.bindaddress", kernelConfiguration.getBindAddress().trim());
+
// Init logging
initLogging(kernelClassLoader);
@@ -163,23 +174,33 @@
setBeanStatus("Kernel", ServiceLifecycle.STARTED);
// Start all URLs defined in bootstrap.xml
- File bootXml = new File(configDirectory, "bootstrap.xml");
- JAXBContext bootJc = JAXBContext.newInstance("org.jboss.jca.fungal.bootstrap");
- Unmarshaller bootU = bootJc.createUnmarshaller();
- org.jboss.jca.fungal.bootstrap.Bootstrap boot =
- (org.jboss.jca.fungal.bootstrap.Bootstrap)bootU.unmarshal(bootXml);
+ if (configDirectory != null && configDirectory.exists() && configDirectory.isDirectory())
+ {
+ File bootXml = new File(configDirectory, "bootstrap.xml");
+ JAXBContext bootJc = JAXBContext.newInstance("org.jboss.jca.fungal.bootstrap");
+ Unmarshaller bootU = bootJc.createUnmarshaller();
+ org.jboss.jca.fungal.bootstrap.Bootstrap boot =
+ (org.jboss.jca.fungal.bootstrap.Bootstrap)bootU.unmarshal(bootXml);
- // Boot urls
- if (boot != null)
- {
- for (String url : boot.getUrl())
+ // Boot urls
+ if (boot != null)
{
- URL fullPath = new URL(configDirectory.toURI().toURL().toExternalForm() + url);
+ for (String url : boot.getUrl())
+ {
+ try
+ {
+ URL fullPath = new URL(configDirectory.toURI().toURL().toExternalForm() + url);
- if (isDebugEnabled())
- debug("URL=" + fullPath.toString());
+ if (isDebugEnabled())
+ debug("URL=" + fullPath.toString());
- mainDeployer.deploy(fullPath, kernelClassLoader);
+ mainDeployer.deploy(fullPath, kernelClassLoader);
+ }
+ catch (Throwable deployThrowable)
+ {
+ error(deployThrowable.getMessage(), deployThrowable);
+ }
+ }
}
}
@@ -188,11 +209,18 @@
{
for (File f : deployDirectory.listFiles())
{
- if (isDebugEnabled())
- debug("URL=" + f.toURI().toURL().toExternalForm());
+ try
+ {
+ if (isDebugEnabled())
+ debug("URL=" + f.toURI().toURL().toExternalForm());
- mainDeployer.deploy(f.toURI().toURL(), kernelClassLoader);
- }
+ mainDeployer.deploy(f.toURI().toURL(), kernelClassLoader);
+ }
+ catch (Throwable deployThrowable)
+ {
+ error(deployThrowable.getMessage(), deployThrowable);
+ }
+ }
}
}
catch (Throwable t)
@@ -342,7 +370,7 @@
* @param name The name of the bean
* @return The bean
*/
- Object getBean(String name)
+ public Object getBean(String name)
{
return services.get(name);
}
@@ -360,7 +388,7 @@
* Get the main deployer
* @return The main deployer
*/
- MainDeployer getMainDeployer()
+ public MainDeployer getMainDeployer()
{
return mainDeployer;
}
Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployer.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployer.java 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployer.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -69,8 +69,9 @@
/**
* Deploy
* @param url The URL for the deployment
+ * @exception Throwable If an error occurs
*/
- public void deploy(URL url)
+ public synchronized void deploy(URL url) throws Throwable
{
deploy(url, kernel.getKernelClassLoader());
}
@@ -79,28 +80,23 @@
* Deploy
* @param url The URL for the deployment
* @param classLoader The class loader
+ * @exception Throwable If an error occurs
*/
- public void deploy(URL url, ClassLoader classLoader)
+ public synchronized void deploy(URL url, ClassLoader classLoader) throws Throwable
{
boolean done = false;
- try
+
+ for (int i = 0; !done && i < deployers.size(); i++)
{
- for (int i = 0; !done && i < deployers.size(); i++)
- {
- Deployer deployer = deployers.get(i);
+ Deployer deployer = deployers.get(i);
- Deployment deployment = deployer.deploy(url, classLoader);
- if (deployment != null)
- {
- kernel.registerDeployment(deployment);
- done = true;
- }
+ Deployment deployment = deployer.deploy(url, classLoader);
+ if (deployment != null)
+ {
+ kernel.registerDeployment(deployment);
+ done = true;
}
}
- catch (Throwable t)
- {
- error(t.getMessage(), t);
- }
}
/**
Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployerMBean.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployerMBean.java 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployerMBean.java 2009-09-11 19:34:44 UTC (rev 93431)
@@ -33,6 +33,7 @@
/**
* Deploy
* @param url The URL for the deployment
+ * @exception Throwable If an error occurs
*/
- public void deploy(URL url);
+ public void deploy(URL url) throws Throwable;
}
Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml 2009-09-11 19:23:07 UTC (rev 93430)
+++ projects/jboss-jca/trunk/ivy.xml 2009-09-11 19:34:44 UTC (rev 93431)
@@ -69,7 +69,6 @@
<dependency org="org.jboss.deployers" name="jboss-deployers-structure-spi" rev="${version.jboss.deployers}" conf="standalone->default"/>
<dependency org="org.jboss.deployers" name="jboss-deployers-vfs" rev="${version.jboss.deployers}" conf="standalone->default"/>
<dependency org="org.jboss.deployers" name="jboss-deployers-vfs-spi" rev="${version.jboss.deployers}" conf="standalone->default"/>
- <dependency org="org.jboss.ejb3" name="jboss-ejb3-test" rev="${version.jboss.ejb3.test}" conf="test->default"/>
<dependency org="org.jboss.integration" name="jboss-integration" rev="${version.jboss.integration}" conf="standalone->default;sjc->*"/>
<dependency org="org.jboss.javaee" name="jboss-transaction-api" rev="${version.transaction.api}" conf="standalone->default;sjc->*"/>
<dependency org="org.jboss.logging" name="jboss-logging-jdk" rev="${version.jboss.logging}" conf="standalone->default;sjc->*"/>
More information about the jboss-cvs-commits
mailing list