[jboss-cvs] JBossAS SVN: r109546 - in projects/jboss-jca/trunk: adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit and 16 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 29 16:21:49 EST 2010
Author: jesper.pedersen
Date: 2010-11-29 16:21:48 -0500 (Mon, 29 Nov 2010)
New Revision: 109546
Added:
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/Embedded.java
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedFactory.java
Modified:
projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/ExceptionSorterTestCase.java
projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/StaleConnectionCheckerTestCase.java
projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/ValidConnectionCheckerTestCase.java
projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2TestCase.java
projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2XATestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/XATxConnectionManagerTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/workmanager/unit/WorkManagerTestCase.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/WorkManagerRejectingDoWorkTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerRejectingScheduleWorkTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerRejectingStartWorkTestCase.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/deployers/src/test/java/org/jboss/jca/deployers/annotations/AnnotationsTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/IronJacamarTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/RaXmlTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/RarTestCase.java
projects/jboss-jca/trunk/doc/userguide/en-US/modules/embedded.xml
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/arquillian/EmbeddedJCAContainer.java
projects/jboss-jca/trunk/embedded/src/test/java/org/jboss/jca/embedded/unit/ShrinkWrapTestCase.java
projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/TestCaseAbstract.java
Log:
[JBJCA-474] Enhance embedded container (Part 1)
Modified: projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/ExceptionSorterTestCase.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/ExceptionSorterTestCase.java 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/ExceptionSorterTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -22,7 +22,8 @@
package org.jboss.jca.adapters.jdbc.spi;
import org.jboss.jca.adapters.jdbc.spi.testimpl.TestExceptionSorter;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
import java.io.File;
import java.net.URL;
@@ -66,12 +67,12 @@
/*
* Embedded
*/
- EmbeddedJCA embedded = null;
+ Embedded embedded = null;
try
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA();
+ embedded = EmbeddedFactory.create();
// Startup
embedded.startup();
Modified: projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/StaleConnectionCheckerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/StaleConnectionCheckerTestCase.java 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/StaleConnectionCheckerTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -22,7 +22,8 @@
package org.jboss.jca.adapters.jdbc.spi;
import org.jboss.jca.adapters.jdbc.spi.testimpl.TestStaleConnectionChecker;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
import java.io.File;
import java.net.URL;
@@ -65,12 +66,12 @@
/*
* Embedded
*/
- EmbeddedJCA embedded = null;
+ Embedded embedded = null;
try
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA();
+ embedded = EmbeddedFactory.create();
// Startup
embedded.startup();
Modified: projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/ValidConnectionCheckerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/ValidConnectionCheckerTestCase.java 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/ValidConnectionCheckerTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -22,7 +22,8 @@
package org.jboss.jca.adapters.jdbc.spi;
import org.jboss.jca.adapters.jdbc.spi.testimpl.TestValidConnectionChecker;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
import java.io.File;
import java.net.URL;
@@ -65,12 +66,12 @@
/*
* Embedded
*/
- EmbeddedJCA embedded = null;
+ Embedded embedded = null;
try
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA();
+ embedded = EmbeddedFactory.create();
// Startup
embedded.startup();
Modified: projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2TestCase.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2TestCase.java 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2TestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -22,7 +22,8 @@
package org.jboss.jca.adapters.jdbc.unit;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
import java.io.File;
import java.net.URL;
@@ -60,7 +61,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
// --------------------------------------------------------------------------------||
// Tests --------------------------------------------------------------------------||
@@ -134,7 +135,7 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA();
+ embedded = EmbeddedFactory.create();
// Startup
embedded.startup();
Modified: projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2XATestCase.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2XATestCase.java 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2XATestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -22,7 +22,8 @@
package org.jboss.jca.adapters.jdbc.unit;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
import java.io.File;
import java.net.URL;
@@ -60,7 +61,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
// --------------------------------------------------------------------------------||
// Tests --------------------------------------------------------------------------||
@@ -134,7 +135,7 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA();
+ embedded = EmbeddedFactory.create();
// Startup
embedded.startup();
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerTestCase.java 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -32,9 +32,11 @@
import org.jboss.jca.core.connectionmanager.pool.api.PoolFactory;
import org.jboss.jca.core.connectionmanager.pool.api.PoolStrategy;
import org.jboss.jca.core.connectionmanager.transaction.TransactionSynchronizer;
-import org.jboss.jca.core.workmanager.unit.WorkManagerTestCase;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
+import java.net.URL;
+
import javax.resource.spi.ManagedConnectionFactory;
import javax.resource.spi.TransactionSupport.TransactionSupportLevel;
import javax.transaction.RollbackException;
@@ -55,7 +57,7 @@
public class TxConnectionManagerTestCase
{
/**Embedded JCA*/
- private static EmbeddedJCA embedded = null;
+ private static Embedded embedded = null;
/**
* testTxAllocateConnection.
@@ -254,14 +256,17 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA(false);
+ embedded = EmbeddedFactory.create(false);
// Startup
embedded.startup();
// Deploy Naming and Transaction
- embedded.deploy(WorkManagerTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- embedded.deploy(WorkManagerTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ URL naming = TxConnectionManagerTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction = TxConnectionManagerTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+
+ embedded.deploy(naming);
+ embedded.deploy(transaction);
}
/**
@@ -272,14 +277,16 @@
public static void afterClass() throws Throwable
{
// Undeploy Transaction and Naming
- embedded.undeploy(WorkManagerTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- embedded.undeploy(WorkManagerTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ URL naming = TxConnectionManagerTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction = TxConnectionManagerTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ embedded.undeploy(transaction);
+ embedded.undeploy(naming);
+
// Shutdown embedded
embedded.shutdown();
// Set embedded to null
embedded = null;
}
-
}
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/XATxConnectionManagerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/XATxConnectionManagerTestCase.java 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/XATxConnectionManagerTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -32,9 +32,11 @@
import org.jboss.jca.core.connectionmanager.pool.api.PoolFactory;
import org.jboss.jca.core.connectionmanager.pool.api.PoolStrategy;
import org.jboss.jca.core.connectionmanager.transaction.TransactionSynchronizer;
-import org.jboss.jca.core.workmanager.unit.WorkManagerTestCase;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
+import java.net.URL;
+
import javax.resource.spi.ManagedConnectionFactory;
import javax.resource.spi.TransactionSupport.TransactionSupportLevel;
import javax.transaction.RollbackException;
@@ -55,7 +57,7 @@
public class XATxConnectionManagerTestCase
{
/**Embedded JCA*/
- private static EmbeddedJCA embedded = null;
+ private static Embedded embedded = null;
/**
* testTxAllocateConnection.
@@ -215,14 +217,17 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA(false);
+ embedded = EmbeddedFactory.create(false);
// Startup
embedded.startup();
// Deploy Naming and Transaction
- embedded.deploy(WorkManagerTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- embedded.deploy(WorkManagerTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+ URL naming = XATxConnectionManagerTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction = XATxConnectionManagerTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+
+ embedded.deploy(naming);
+ embedded.deploy(transaction);
}
/**
@@ -233,9 +238,12 @@
public static void afterClass() throws Throwable
{
// Undeploy Transaction and Naming
- embedded.undeploy(WorkManagerTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- embedded.undeploy(WorkManagerTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ URL naming = XATxConnectionManagerTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction = XATxConnectionManagerTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ embedded.undeploy(transaction);
+ embedded.undeploy(naming);
+
// Shutdown embedded
embedded.shutdown();
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/workmanager/unit/WorkManagerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/workmanager/unit/WorkManagerTestCase.java 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/workmanager/unit/WorkManagerTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -22,8 +22,11 @@
package org.jboss.jca.core.workmanager.unit;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
+import java.net.URL;
+
import org.jboss.logging.Logger;
import org.junit.AfterClass;
@@ -51,7 +54,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
// --------------------------------------------------------------------------------||
// Tests --------------------------------------------------------------------------||
@@ -114,15 +117,22 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA(false);
+ embedded = EmbeddedFactory.create(false);
// Startup
embedded.startup();
// Deploy Naming, Transaction and WorkManager
- 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");
+ URL naming =
+ WorkManagerTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkManagerTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkManagerTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+
+ embedded.deploy(naming);
+ embedded.deploy(transaction);
+ embedded.deploy(wm);
}
/**
@@ -133,10 +143,17 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- 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");
+ URL naming =
+ WorkManagerTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkManagerTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkManagerTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ embedded.undeploy(wm);
+ embedded.undeploy(transaction);
+ embedded.undeploy(naming);
+
// Shutdown embedded
embedded.shutdown();
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 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkAdapterTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -21,12 +21,14 @@
*/
package org.jboss.jca.test.core.spec.chapter10.api;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
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;
import org.jboss.jca.test.core.spec.chapter10.common.ShortRunningWork;
+import java.net.URL;
import java.util.concurrent.CountDownLatch;
import javax.resource.spi.work.Work;
@@ -51,7 +53,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
/**
* workAccepted method
@@ -168,15 +170,22 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA(false);
+ embedded = EmbeddedFactory.create(false);
// Startup
embedded.startup();
// Deploy Naming, Transaction and WorkManager
- 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");
+ URL naming =
+ WorkAdapterTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkAdapterTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkAdapterTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+
+ embedded.deploy(naming);
+ embedded.deploy(transaction);
+ embedded.deploy(wm);
}
/**
@@ -187,10 +196,17 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- 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");
+ URL naming =
+ WorkAdapterTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkAdapterTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkAdapterTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ embedded.undeploy(wm);
+ embedded.undeploy(transaction);
+ embedded.undeploy(naming);
+
// Shutdown
embedded.shutdown();
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 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkListenerTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -21,12 +21,14 @@
*/
package org.jboss.jca.test.core.spec.chapter10.api;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
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;
import org.jboss.jca.test.core.spec.chapter10.common.ShortRunningWork;
+import java.net.URL;
import java.util.concurrent.CountDownLatch;
import javax.resource.spi.work.Work;
@@ -51,7 +53,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
/**
* workAccepted method
@@ -168,15 +170,22 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA(false);
+ embedded = EmbeddedFactory.create(false);
// Startup
embedded.startup();
// Deploy Naming, Transaction and WorkManager
- 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");
+ URL naming =
+ WorkListenerTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkListenerTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkListenerTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+
+ embedded.deploy(naming);
+ embedded.deploy(transaction);
+ embedded.deploy(wm);
}
/**
@@ -187,10 +196,17 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- 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");
+ URL naming =
+ WorkListenerTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkListenerTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkListenerTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ embedded.undeploy(wm);
+ embedded.undeploy(transaction);
+ embedded.undeploy(naming);
+
// Shutdown
embedded.shutdown();
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 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerDoWorkTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -21,11 +21,14 @@
*/
package org.jboss.jca.test.core.spec.chapter10.api;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
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;
+import java.net.URL;
+
import javax.resource.spi.work.ExecutionContext;
import javax.resource.spi.work.Work;
import javax.resource.spi.work.WorkException;
@@ -51,7 +54,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
/**
* doWork method: This call blocks until the Work instance completes execution.
@@ -319,15 +322,22 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA(false);
+ embedded = EmbeddedFactory.create(false);
// Startup
embedded.startup();
// Deploy Naming, Transaction and WorkManager
- 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");
+ URL naming =
+ WorkManagerDoWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkManagerDoWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkManagerDoWorkTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+
+ embedded.deploy(naming);
+ embedded.deploy(transaction);
+ embedded.deploy(wm);
}
/**
@@ -338,10 +348,17 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- 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");
+ URL naming =
+ WorkManagerDoWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkManagerDoWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkManagerDoWorkTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ embedded.undeploy(wm);
+ embedded.undeploy(transaction);
+ embedded.undeploy(naming);
+
// Shutdown
embedded.shutdown();
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerRejectingDoWorkTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerRejectingDoWorkTestCase.java 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerRejectingDoWorkTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -21,10 +21,13 @@
*/
package org.jboss.jca.test.core.spec.chapter10.api;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
import org.jboss.jca.test.core.spec.chapter10.common.MyWorkAdapter;
import org.jboss.jca.test.core.spec.chapter10.common.ShortRunningWork;
+import java.net.URL;
+
import javax.resource.spi.work.WorkManager;
import javax.resource.spi.work.WorkRejectedException;
@@ -46,7 +49,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
/**
* doWork method
@@ -88,16 +91,22 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA(false);
+ embedded = EmbeddedFactory.create(false);
// Startup
embedded.startup();
// Deploy Naming, Transaction and WorkManager
- embedded.deploy(WorkManagerRejectingStartWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- embedded.deploy(WorkManagerRejectingStartWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- embedded.deploy(WorkManagerRejectingStartWorkTestCase.class.getClassLoader(),
- "rejecting-workmanager-jboss-beans.xml");
+ URL naming =
+ WorkManagerRejectingDoWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkManagerRejectingDoWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkManagerRejectingDoWorkTestCase.class.getClassLoader().getResource("rejecting-workmanager-jboss-beans.xml");
+
+ embedded.deploy(naming);
+ embedded.deploy(transaction);
+ embedded.deploy(wm);
}
/**
@@ -108,11 +117,17 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- embedded.undeploy(WorkManagerRejectingStartWorkTestCase.class.getClassLoader(),
- "rejecting-workmanager-jboss-beans.xml");
- embedded.undeploy(WorkManagerRejectingStartWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- embedded.undeploy(WorkManagerRejectingStartWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ URL naming =
+ WorkManagerRejectingDoWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkManagerRejectingDoWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkManagerRejectingDoWorkTestCase.class.getClassLoader().getResource("rejecting-workmanager-jboss-beans.xml");
+ embedded.undeploy(wm);
+ embedded.undeploy(transaction);
+ embedded.undeploy(naming);
+
// Shutdown embedded
embedded.shutdown();
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerRejectingScheduleWorkTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerRejectingScheduleWorkTestCase.java 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerRejectingScheduleWorkTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -21,10 +21,13 @@
*/
package org.jboss.jca.test.core.spec.chapter10.api;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
import org.jboss.jca.test.core.spec.chapter10.common.MyWorkAdapter;
import org.jboss.jca.test.core.spec.chapter10.common.ShortRunningWork;
+import java.net.URL;
+
import javax.resource.spi.work.WorkManager;
import javax.resource.spi.work.WorkRejectedException;
@@ -46,7 +49,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
/**
* scheduleWork method
@@ -88,16 +91,23 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA(false);
+ embedded = EmbeddedFactory.create(false);
// Startup
embedded.startup();
// Deploy Naming, Transaction and WorkManager
- embedded.deploy(WorkManagerRejectingStartWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- embedded.deploy(WorkManagerRejectingStartWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- embedded.deploy(WorkManagerRejectingStartWorkTestCase.class.getClassLoader(),
- "rejecting-workmanager-jboss-beans.xml");
+ URL naming =
+ WorkManagerRejectingScheduleWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkManagerRejectingScheduleWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkManagerRejectingScheduleWorkTestCase.class.getClassLoader().
+ getResource("rejecting-workmanager-jboss-beans.xml");
+
+ embedded.deploy(naming);
+ embedded.deploy(transaction);
+ embedded.deploy(wm);
}
/**
@@ -108,11 +118,18 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- embedded.undeploy(WorkManagerRejectingStartWorkTestCase.class.getClassLoader(),
- "rejecting-workmanager-jboss-beans.xml");
- embedded.undeploy(WorkManagerRejectingStartWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- embedded.undeploy(WorkManagerRejectingStartWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ URL naming =
+ WorkManagerRejectingScheduleWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkManagerRejectingScheduleWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkManagerRejectingScheduleWorkTestCase.class.getClassLoader().
+ getResource("rejecting-workmanager-jboss-beans.xml");
+ embedded.undeploy(wm);
+ embedded.undeploy(transaction);
+ embedded.undeploy(naming);
+
// Shutdown embedded
embedded.shutdown();
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerRejectingStartWorkTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerRejectingStartWorkTestCase.java 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerRejectingStartWorkTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -21,10 +21,13 @@
*/
package org.jboss.jca.test.core.spec.chapter10.api;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
import org.jboss.jca.test.core.spec.chapter10.common.MyWorkAdapter;
import org.jboss.jca.test.core.spec.chapter10.common.ShortRunningWork;
+import java.net.URL;
+
import javax.resource.spi.work.WorkManager;
import javax.resource.spi.work.WorkRejectedException;
@@ -46,7 +49,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
/**
* startWork method
@@ -88,16 +91,23 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA(false);
+ embedded = EmbeddedFactory.create(false);
// Startup
embedded.startup();
// Deploy Naming, Transaction and WorkManager
- embedded.deploy(WorkManagerRejectingStartWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
- embedded.deploy(WorkManagerRejectingStartWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- embedded.deploy(WorkManagerRejectingStartWorkTestCase.class.getClassLoader(),
- "rejecting-workmanager-jboss-beans.xml");
+ URL naming =
+ WorkManagerRejectingStartWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkManagerRejectingStartWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkManagerRejectingStartWorkTestCase.class.getClassLoader().
+ getResource("rejecting-workmanager-jboss-beans.xml");
+
+ embedded.deploy(naming);
+ embedded.deploy(transaction);
+ embedded.deploy(wm);
}
/**
@@ -108,11 +118,18 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- embedded.undeploy(WorkManagerRejectingStartWorkTestCase.class.getClassLoader(),
- "rejecting-workmanager-jboss-beans.xml");
- embedded.undeploy(WorkManagerRejectingStartWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
- embedded.undeploy(WorkManagerRejectingStartWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
+ URL naming =
+ WorkManagerRejectingStartWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkManagerRejectingStartWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkManagerRejectingStartWorkTestCase.class.getClassLoader().
+ getResource("rejecting-workmanager-jboss-beans.xml");
+ embedded.undeploy(wm);
+ embedded.undeploy(transaction);
+ embedded.undeploy(naming);
+
// Shutdown embedded
embedded.shutdown();
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 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerScheduleWorkTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -21,11 +21,13 @@
*/
package org.jboss.jca.test.core.spec.chapter10.api;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
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;
+import java.net.URL;
import java.util.concurrent.CountDownLatch;
import javax.resource.spi.work.ExecutionContext;
@@ -53,7 +55,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
/**
* scheduleWork method: TThis call does not block and returns immediately once a
@@ -399,15 +401,22 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA(false);
+ embedded = EmbeddedFactory.create(false);
// Startup
embedded.startup();
// Deploy Naming, Transaction and WorkManager
- 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");
+ URL naming =
+ WorkManagerScheduleWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkManagerScheduleWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkManagerScheduleWorkTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+
+ embedded.deploy(naming);
+ embedded.deploy(transaction);
+ embedded.deploy(wm);
}
/**
@@ -418,10 +427,17 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- 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");
+ URL naming =
+ WorkManagerScheduleWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkManagerScheduleWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkManagerScheduleWorkTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ embedded.undeploy(wm);
+ embedded.undeploy(transaction);
+ embedded.undeploy(naming);
+
// Shutdown embedded
embedded.shutdown();
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 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerStartWorkTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -21,11 +21,13 @@
*/
package org.jboss.jca.test.core.spec.chapter10.api;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
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;
+import java.net.URL;
import java.util.concurrent.CountDownLatch;
import javax.resource.spi.work.ExecutionContext;
@@ -53,7 +55,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
/**
* startWork method: This call blocks until the Work instance starts execution but
@@ -421,15 +423,22 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA(false);
+ embedded = EmbeddedFactory.create(false);
// Startup
embedded.startup();
// Deploy Naming, Transaction and WorkManager
- 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");
+ URL naming =
+ WorkManagerStartWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkManagerStartWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkManagerStartWorkTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+
+ embedded.deploy(naming);
+ embedded.deploy(transaction);
+ embedded.deploy(wm);
}
/**
@@ -440,10 +449,17 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- 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");
+ URL naming =
+ WorkManagerStartWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkManagerStartWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkManagerStartWorkTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ embedded.undeploy(wm);
+ embedded.undeploy(transaction);
+ embedded.undeploy(naming);
+
// Shutdown embedded
embedded.shutdown();
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 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -21,9 +21,12 @@
*/
package org.jboss.jca.test.core.spec.chapter10.api;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
import org.jboss.jca.test.core.spec.chapter10.common.ShortRunningWork;
+import java.net.URL;
+
import javax.resource.spi.work.WorkManager;
import org.junit.AfterClass;
@@ -44,7 +47,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
/**
* testRun
@@ -91,15 +94,22 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA(false);
+ embedded = EmbeddedFactory.create(false);
// Startup
embedded.startup();
// Deploy Naming, Transaction and WorkManager
- 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");
+ URL naming =
+ WorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+
+ embedded.deploy(naming);
+ embedded.deploy(transaction);
+ embedded.deploy(wm);
}
/**
@@ -110,10 +120,17 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- 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");
+ URL naming =
+ WorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ embedded.undeploy(wm);
+ embedded.undeploy(transaction);
+ embedded.undeploy(naming);
+
// Shutdown embedded
embedded.shutdown();
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 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section1/ManageThreadTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -21,8 +21,11 @@
*/
package org.jboss.jca.test.core.spec.chapter10.section1;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
+import java.net.URL;
+
import org.jboss.threads.BlockingExecutor;
import org.junit.AfterClass;
@@ -44,7 +47,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
/**
* Test for paragraph 4 : bullet 1
@@ -110,15 +113,22 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA(false);
+ embedded = EmbeddedFactory.create(false);
// Startup
embedded.startup();
// Deploy Naming, Transaction and WorkManager
- 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");
+ URL naming =
+ ManageThreadTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ ManageThreadTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ ManageThreadTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+
+ embedded.deploy(naming);
+ embedded.deploy(transaction);
+ embedded.deploy(wm);
}
/**
@@ -129,10 +139,17 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- 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");
+ URL naming =
+ ManageThreadTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ ManageThreadTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ ManageThreadTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ embedded.undeploy(wm);
+ embedded.undeploy(transaction);
+ embedded.undeploy(naming);
+
// Shutdown embedded
embedded.shutdown();
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 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkInterfaceTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -21,12 +21,14 @@
*/
package org.jboss.jca.test.core.spec.chapter10.section3;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
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;
import org.jboss.jca.test.core.spec.chapter10.common.UnsynchronizedWork;
+import java.net.URL;
import java.util.concurrent.CountDownLatch;
import javax.resource.spi.work.WorkCompletedException;
@@ -52,7 +54,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
/**
* Test for paragraph 2
@@ -198,15 +200,22 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA(false);
+ embedded = EmbeddedFactory.create(false);
// Startup
embedded.startup();
// Deploy Naming, Transaction and WorkManager
- 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");
+ URL naming =
+ WorkInterfaceTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkInterfaceTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkInterfaceTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+
+ embedded.deploy(naming);
+ embedded.deploy(transaction);
+ embedded.deploy(wm);
}
/**
@@ -217,10 +226,17 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- 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");
+ URL naming =
+ WorkInterfaceTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkInterfaceTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkInterfaceTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ embedded.undeploy(wm);
+ embedded.undeploy(transaction);
+ embedded.undeploy(naming);
+
// Shutdown MC
embedded.shutdown();
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 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkListenerInterfaceTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -21,12 +21,14 @@
*/
package org.jboss.jca.test.core.spec.chapter10.section3;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
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;
import org.jboss.jca.test.core.spec.chapter10.common.ShortRunningWork;
+import java.net.URL;
import java.util.concurrent.CountDownLatch;
import javax.resource.spi.work.Work;
@@ -51,7 +53,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
/**
* Test for paragraph 1 Section 3.3.1
@@ -292,15 +294,22 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA(false);
+ embedded = EmbeddedFactory.create(false);
// Startup
embedded.startup();
// Deploy Naming, Transaction and WorkManager
- 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");
+ URL naming =
+ WorkListenerInterfaceTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkListenerInterfaceTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkListenerInterfaceTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+
+ embedded.deploy(naming);
+ embedded.deploy(transaction);
+ embedded.deploy(wm);
}
/**
@@ -311,10 +320,17 @@
public static void afterClass() throws Throwable
{
// Undeploy WorkManager, Transaction and Naming
- 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");
+ URL naming =
+ WorkListenerInterfaceTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkListenerInterfaceTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkListenerInterfaceTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ embedded.undeploy(wm);
+ embedded.undeploy(transaction);
+ embedded.undeploy(naming);
+
// Shutdown MC
embedded.shutdown();
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 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagementModelTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -21,10 +21,12 @@
*/
package org.jboss.jca.test.core.spec.chapter10.section3;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
import org.jboss.jca.test.core.spec.chapter10.common.LongRunningWork;
import org.jboss.jca.test.core.spec.chapter10.common.PriorityWork;
+import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
@@ -53,7 +55,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
/**
* Test for paragraph 1
@@ -280,18 +282,30 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA(false);
+ embedded = EmbeddedFactory.create(false);
// Startup
embedded.startup();
// Deploy Naming, Transaction and WorkManager
- 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");
+ URL naming =
+ WorkManagementModelTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkManagementModelTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkManagementModelTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ embedded.deploy(naming);
+ embedded.deploy(transaction);
+ embedded.deploy(wm);
+
// Deploy Beans
- embedded.deploy(WorkManagementModelTestCase.class);
+ String name =
+ WorkManagementModelTestCase.class.getName().replace('.', '/') + "-jboss-beans.xml";
+ URL beans =
+ WorkManagementModelTestCase.class.getClassLoader().getResource(name);
+
+ embedded.deploy(beans);
}
/**
@@ -302,13 +316,25 @@
public static void afterClass() throws Throwable
{
// Undeploy Beans
- embedded.undeploy(WorkManagementModelTestCase.class);
+ String name =
+ WorkManagementModelTestCase.class.getName().replace('.', '/') + "-jboss-beans.xml";
+ URL beans =
+ WorkManagementModelTestCase.class.getClassLoader().getResource(name);
+ embedded.undeploy(beans);
+
// Undeploy WorkManager, Transaction and Naming
- 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");
+ URL naming =
+ WorkManagementModelTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkManagementModelTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkManagementModelTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ embedded.undeploy(wm);
+ embedded.undeploy(transaction);
+ embedded.undeploy(naming);
+
// Shutdown MC
embedded.shutdown();
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 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -21,10 +21,12 @@
*/
package org.jboss.jca.test.core.spec.chapter10.section3;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
import org.jboss.jca.test.core.spec.chapter10.common.BlockRunningWork;
import org.jboss.jca.test.core.spec.chapter10.common.NestCharWork;
+import java.net.URL;
import java.util.concurrent.CountDownLatch;
import javax.resource.spi.BootstrapContext;
@@ -50,7 +52,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
/**
* Test for paragraph 1
@@ -318,18 +320,30 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA(false);
+ embedded = EmbeddedFactory.create(false);
// Startup
embedded.startup();
// Deploy Naming, Transaction and WorkManager
- 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");
+ URL naming =
+ WorkManagerInterfaceTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkManagerInterfaceTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkManagerInterfaceTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ embedded.deploy(naming);
+ embedded.deploy(transaction);
+ embedded.deploy(wm);
+
// Deploy Beans
- embedded.deploy(WorkManagerInterfaceTestCase.class);
+ String name =
+ WorkManagerInterfaceTestCase.class.getName().replace('.', '/') + "-jboss-beans.xml";
+ URL beans =
+ WorkManagerInterfaceTestCase.class.getClassLoader().getResource(name);
+
+ embedded.deploy(beans);
}
/**
@@ -340,13 +354,25 @@
public static void afterClass() throws Throwable
{
// Undeploy Beans
- embedded.deploy(WorkManagerInterfaceTestCase.class);
+ String name =
+ WorkManagerInterfaceTestCase.class.getName().replace('.', '/') + "-jboss-beans.xml";
+ URL beans =
+ WorkManagerInterfaceTestCase.class.getClassLoader().getResource(name);
+ embedded.deploy(beans);
+
// Undeploy WorkManager, Transaction and Naming
- 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");
+ URL naming =
+ WorkManagerInterfaceTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkManagerInterfaceTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkManagerInterfaceTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ embedded.undeploy(wm);
+ embedded.undeploy(transaction);
+ embedded.undeploy(naming);
+
// Shutdown
embedded.shutdown();
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 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/api/WorkContextProviderGetWorkContextsTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -22,9 +22,11 @@
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.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
+import java.net.URL;
+
import junit.framework.Assert;
import org.junit.AfterClass;
@@ -43,7 +45,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
/**
* Test api for {@link WorkContextProvider#getWorkContexts()}
@@ -66,16 +68,22 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA(false);
+ embedded = EmbeddedFactory.create(false);
// Startup
embedded.startup();
// Deploy Naming, Transaction and WorkManager
- 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");
+ URL naming =
+ WorkContextProviderGetWorkContextsTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkContextProviderGetWorkContextsTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkContextProviderGetWorkContextsTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ embedded.deploy(naming);
+ embedded.deploy(transaction);
+ embedded.deploy(wm);
}
/**
@@ -85,7 +93,16 @@
@AfterClass
public static void afterClass() throws Throwable
{
- embedded.undeploy(WorkContextHandlingAssignmentTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
+ URL naming =
+ WorkContextProviderGetWorkContextsTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkContextProviderGetWorkContextsTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkContextProviderGetWorkContextsTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+
+ embedded.undeploy(wm);
+ embedded.undeploy(transaction);
+ embedded.undeploy(naming);
embedded.shutdown();
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 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/section4/subsection3/WorkContextHandlingAssignmentTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -22,12 +22,15 @@
package org.jboss.jca.test.core.spec.chapter11.section4.subsection3;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
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;
import org.jboss.jca.test.core.spec.chapter11.common.UnsupportedWork;
+import java.net.URL;
+
import javax.resource.spi.work.WorkCompletedException;
import javax.resource.spi.work.WorkManager;
@@ -45,7 +48,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
/**
* Test unsupported context.
@@ -99,16 +102,23 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA(false);
+ embedded = EmbeddedFactory.create(false);
// Startup
embedded.startup();
// Deploy Naming, Transaction and WorkManager
- 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");
+ URL naming =
+ WorkContextHandlingAssignmentTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkContextHandlingAssignmentTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkContextHandlingAssignmentTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ embedded.deploy(naming);
+ embedded.deploy(transaction);
+ embedded.deploy(wm);
+
}
/**
@@ -118,9 +128,16 @@
@AfterClass
public static void afterClass() throws Throwable
{
- 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");
+ URL naming =
+ WorkContextHandlingAssignmentTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkContextHandlingAssignmentTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm =
+ WorkContextHandlingAssignmentTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+
+ embedded.undeploy(wm);
+ embedded.undeploy(transaction);
+ embedded.undeploy(naming);
embedded.shutdown();
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 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/section5/TransactionContextTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -22,10 +22,12 @@
package org.jboss.jca.test.core.spec.chapter11.section5;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
import org.jboss.jca.test.core.spec.chapter11.common.TransactionContextWork;
-import org.jboss.jca.test.core.spec.chapter11.section4.subsection3.WorkContextHandlingAssignmentTestCase;
+import java.net.URL;
+
import javax.resource.spi.work.ExecutionContext;
import javax.resource.spi.work.WorkManager;
import javax.resource.spi.work.WorkRejectedException;
@@ -44,7 +46,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
/**
* Test whether or not work contains both execution context and implement {@link WorkContextProvider}.
@@ -66,16 +68,20 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA(false);
+ embedded = EmbeddedFactory.create(false);
// Startup
embedded.startup();
// Deploy Naming, Transaction and WorkManager
- 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");
+ URL naming = TransactionContextTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction = TransactionContextTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm = TransactionContextTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ embedded.deploy(naming);
+ embedded.deploy(transaction);
+ embedded.deploy(wm);
+
}
/**
@@ -85,12 +91,15 @@
@AfterClass
public static void afterClass() throws Throwable
{
- 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");
+ URL naming = TransactionContextTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction = TransactionContextTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm = TransactionContextTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+
+ embedded.undeploy(wm);
+ embedded.undeploy(transaction);
+ embedded.undeploy(naming);
embedded.shutdown();
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 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/section7/WorkContextSetupListenerTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -22,12 +22,15 @@
package org.jboss.jca.test.core.spec.chapter11.section7;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
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;
import org.jboss.jca.test.core.spec.chapter11.section4.subsection3.WorkContextHandlingAssignmentTestCase;
+import java.net.URL;
+
import javax.resource.spi.work.WorkContextErrorCodes;
import javax.resource.spi.work.WorkManager;
@@ -48,7 +51,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
/**
* Test {@link WorkContextLifecycleListener} for transaction context.
@@ -65,8 +68,7 @@
boolean complete = TransactionContextCustom.isContextSetupComplete();
Assert.assertEquals("", errorCode);
- Assert.assertTrue(complete);
-
+ Assert.assertTrue(complete);
}
/**
@@ -91,8 +93,7 @@
boolean complete = TransactionContextCustom.isContextSetupComplete();
Assert.assertEquals(WorkContextErrorCodes.DUPLICATE_CONTEXTS, errorCode);
- Assert.assertFalse(complete);
-
+ Assert.assertFalse(complete);
}
@@ -104,16 +105,21 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA(false);
+ embedded = EmbeddedFactory.create(false);
// Startup
embedded.startup();
// Deploy Naming, Transaction and WorkManager
- 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");
+ URL naming = WorkContextSetupListenerTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkContextSetupListenerTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm = WorkContextSetupListenerTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ embedded.deploy(naming);
+ embedded.deploy(transaction);
+ embedded.deploy(wm);
+
}
/**
@@ -123,12 +129,16 @@
@AfterClass
public static void afterClass() throws Throwable
{
- 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");
+ URL naming = WorkContextSetupListenerTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL transaction =
+ WorkContextSetupListenerTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL wm = WorkContextSetupListenerTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+
+ embedded.undeploy(wm);
+ embedded.undeploy(transaction);
+ embedded.undeploy(naming);
embedded.shutdown();
embedded = null;
}
-
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/deployers/annotations/AnnotationsTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/deployers/annotations/AnnotationsTestCase.java 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/deployers/annotations/AnnotationsTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -27,7 +27,6 @@
import org.jboss.jca.common.api.validator.ValidateException;
import org.jboss.jca.common.spi.annotations.repository.AnnotationRepository;
import org.jboss.jca.common.spi.annotations.repository.AnnotationScanner;
-import org.jboss.jca.embedded.EmbeddedJCA;
import java.io.File;
import java.io.IOException;
@@ -60,11 +59,6 @@
private static Logger log = Logger.getLogger(AnnotationsTestCase.class);
/*
- * Embedded
- */
- private static EmbeddedJCA embedded;
-
- /*
* Annotations
*/
private Annotations annotations;
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/IronJacamarTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/IronJacamarTestCase.java 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/IronJacamarTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -22,7 +22,8 @@
package org.jboss.jca.test.deployers.spec;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
import java.io.File;
import java.net.URL;
@@ -59,7 +60,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
// --------------------------------------------------------------------------------||
// Tests --------------------------------------------------------------------------||
@@ -118,7 +119,7 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA();
+ embedded = EmbeddedFactory.create();
// Startup
embedded.startup();
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/RaXmlTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/RaXmlTestCase.java 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/RaXmlTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -23,7 +23,8 @@
package org.jboss.jca.test.deployers.spec;
import org.jboss.jca.deployers.fungal.RAActivator;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
import java.io.File;
import java.net.URL;
@@ -60,7 +61,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
// --------------------------------------------------------------------------------||
// Tests --------------------------------------------------------------------------||
@@ -122,7 +123,7 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA();
+ embedded = EmbeddedFactory.create();
// Startup
embedded.startup();
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/RarTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/RarTestCase.java 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/RarTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -22,7 +22,8 @@
package org.jboss.jca.test.deployers.spec;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
import java.io.File;
import java.net.URL;
@@ -58,7 +59,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
// --------------------------------------------------------------------------------||
// Tests --------------------------------------------------------------------------||
@@ -1088,7 +1089,7 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA();
+ embedded = EmbeddedFactory.create();
// Startup
embedded.startup();
Modified: projects/jboss-jca/trunk/doc/userguide/en-US/modules/embedded.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en-US/modules/embedded.xml 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/doc/userguide/en-US/modules/embedded.xml 2010-11-29 21:21:48 UTC (rev 109546)
@@ -73,7 +73,8 @@
into the IronJacamar Embedded environment.</para>
<programlisting language="java">
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
import java.net.URL;
@@ -89,7 +90,7 @@
public class MyTestCase
{
/** Embedded */
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
/** JNDI prefix */
private static final String JNDI_PREFIX = "java:/eis/";
@@ -139,7 +140,7 @@
public static void beforeClass() throws Throwable
{
// Create an embedded JCA instance
- embedded = new EmbeddedJCA();
+ embedded = EmbeddedFactory.create();
// Startup
embedded.startup();
@@ -224,7 +225,8 @@
<programlisting>
<![CDATA[
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
import org.jboss.jca.embedded.rars.simple.MessageListener;
import org.jboss.jca.embedded.rars.simple.TestActivationSpec;
import org.jboss.jca.embedded.rars.simple.TestConnection;
@@ -254,7 +256,7 @@
private static Logger log = Logger.getLogger(ShrinkWrapTestCase.class);
/** Embedded */
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
/** JNDI prefix */
private static final String JNDI_PREFIX = "java:/eis/";
@@ -323,7 +325,7 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA();
+ embedded = EmbeddedFactory.create();
// Startup
embedded.startup();
Added: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/Embedded.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/Embedded.java (rev 0)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/Embedded.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -0,0 +1,83 @@
+/*
+ * 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 java.net.URL;
+
+import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
+
+/**
+ * The embedded IronJacamar container
+ * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
+ */
+public interface Embedded
+{
+ /**
+ * Startup
+ * @exception Throwable If an error occurs
+ */
+ public void startup() throws Throwable;
+
+ /**
+ * Shutdown
+ * @exception Throwable If an error occurs
+ */
+ public void shutdown() throws Throwable;
+
+ /**
+ * Deploy
+ * @param url The resource url
+ * @exception Throwable If an error occurs
+ */
+ public void deploy(URL url) throws Throwable;
+
+ /**
+ * Deploy
+ * @param raa The resource adapter archive
+ * @exception Throwable If an error occurs
+ */
+ public void deploy(ResourceAdapterArchive raa) throws Throwable;
+
+ /**
+ * Undeploy
+ * @param url The resource url
+ * @exception Throwable If an error occurs
+ */
+ public void undeploy(URL url) throws Throwable;
+
+ /**
+ * Undeploy
+ * @param raa The resource adapter archive
+ * @exception Throwable If an error occurs
+ */
+ public void undeploy(ResourceAdapterArchive raa) throws Throwable;
+
+ /**
+ * 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;
+}
Added: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedFactory.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedFactory.java (rev 0)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedFactory.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -0,0 +1,54 @@
+/*
+ * 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;
+
+/**
+ * The embedded IronJacamar container factory
+ * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
+ */
+public class EmbeddedFactory
+{
+ /**
+ * Constructor
+ */
+ private EmbeddedFactory()
+ {
+ }
+
+ /**
+ * Create an instance of the embedded container
+ */
+ public static Embedded create()
+ {
+ return create(true);
+ }
+
+ /**
+ * Create an instance of the embedded container
+ * @param fullProfile Should a full JCA 1.6 profile be initialized
+ */
+ public static Embedded create(boolean fullProfile)
+ {
+ return new EmbeddedJCA(fullProfile);
+ }
+}
Modified: 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 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -43,7 +43,7 @@
* The embedded IronJacamar container
* @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
*/
-public class EmbeddedJCA
+class EmbeddedJCA implements Embedded
{
/** Enable full profile */
private boolean fullProfile;
@@ -58,7 +58,7 @@
* Constructs an embedded JCA environment using
* the full JCA 1.6 profile
*/
- public EmbeddedJCA()
+ EmbeddedJCA()
{
this(true);
}
@@ -70,7 +70,7 @@
* to be added as deployments
* @param fullProfile Should a full profile be initialized
*/
- public EmbeddedJCA(boolean fullProfile)
+ EmbeddedJCA(boolean fullProfile)
{
this.fullProfile = fullProfile;
this.shrinkwrapDeployments = null;
@@ -247,7 +247,7 @@
* @param name The resource name
* @exception Throwable If an error occurs
*/
- public void deploy(ClassLoader cl, String name) throws Throwable
+ private void deploy(ClassLoader cl, String name) throws Throwable
{
if (cl == null)
throw new IllegalArgumentException("ClassLoader is null");
@@ -260,23 +260,6 @@
}
/**
- * 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
@@ -316,7 +299,7 @@
* @param name The resource name
* @exception Throwable If an error occurs
*/
- public void undeploy(ClassLoader cl, String name) throws Throwable
+ private void undeploy(ClassLoader cl, String name) throws Throwable
{
if (cl == null)
throw new IllegalArgumentException("ClassLoader is null");
@@ -329,23 +312,6 @@
}
/**
- * 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");
-
- String name = clz.getName().replace('.', '/');
- name += "-jboss-beans.xml";
-
- URL url = clz.getClassLoader().getResource(name);
- kernel.getMainDeployer().undeploy(url);
- }
-
- /**
* Remove ShrinkWrap deployment
* @param deployment The deployment
* @exception IOException Thrown if the deployment cant be removed
Modified: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCAContainer.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCAContainer.java 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCAContainer.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -21,7 +21,8 @@
*/
package org.jboss.jca.embedded.arquillian;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
import org.jboss.arquillian.protocol.local.LocalMethodExecutor;
import org.jboss.arquillian.spi.Configuration;
@@ -42,7 +43,7 @@
public class EmbeddedJCAContainer implements DeployableContainer
{
/** EmbeddedJCA */
- private EmbeddedJCA embedded;
+ private Embedded embedded;
/**
* Constructor
@@ -126,7 +127,7 @@
@Override
public void start(final Context context) throws LifecycleException
{
- embedded = new EmbeddedJCA();
+ embedded = EmbeddedFactory.create();
try
{
embedded.startup();
Modified: projects/jboss-jca/trunk/embedded/src/test/java/org/jboss/jca/embedded/unit/ShrinkWrapTestCase.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/test/java/org/jboss/jca/embedded/unit/ShrinkWrapTestCase.java 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/embedded/src/test/java/org/jboss/jca/embedded/unit/ShrinkWrapTestCase.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -22,7 +22,8 @@
package org.jboss.jca.embedded.unit;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
import org.jboss.jca.embedded.rars.simple.MessageListener;
import org.jboss.jca.embedded.rars.simple.TestActivationSpec;
import org.jboss.jca.embedded.rars.simple.TestConnection;
@@ -70,7 +71,7 @@
/*
* Embedded
*/
- private static EmbeddedJCA embedded;
+ private static Embedded embedded;
// --------------------------------------------------------------------------------||
// Tests --------------------------------------------------------------------------||
@@ -174,7 +175,7 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA();
+ embedded = EmbeddedFactory.create();
// Startup
embedded.startup();
Modified: projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/TestCaseAbstract.java
===================================================================
--- projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/TestCaseAbstract.java 2010-11-29 20:56:40 UTC (rev 109545)
+++ projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/TestCaseAbstract.java 2010-11-29 21:21:48 UTC (rev 109546)
@@ -21,7 +21,8 @@
*/
package org.jboss.jca.validator.rules;
-import org.jboss.jca.embedded.EmbeddedJCA;
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
import org.jboss.jca.validator.rules.ra.TestActivationSpec;
import org.jboss.jca.validator.rules.ra.TestManagedConnection;
import org.jboss.jca.validator.rules.ra.TestResourceAdapterRight;
@@ -49,7 +50,7 @@
/**
* Protected embedded JCA used by subclass to deploy
*/
- protected static EmbeddedJCA embedded;
+ protected static Embedded embedded;
/**
* It create the Resource adapter to deploy using shrinkwrap
@@ -109,7 +110,7 @@
public static void beforeClass() throws Throwable
{
// Create and set an embedded JCA instance
- embedded = new EmbeddedJCA();
+ embedded = EmbeddedFactory.create();
// Startup
embedded.startup();
More information about the jboss-cvs-commits
mailing list