[jboss-cvs] JBossAS SVN: r109556 - in projects/jboss-jca/trunk/core/src/test: java/org/jboss/jca/core/workmanager/unit and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 30 09:19:08 EST 2010
Author: jesper.pedersen
Date: 2010-11-30 09:19:06 -0500 (Tue, 30 Nov 2010)
New Revision: 109556
Added:
projects/jboss-jca/trunk/core/src/test/resources/bootstrap.xml
projects/jboss-jca/trunk/core/src/test/resources/naming.xml
projects/jboss-jca/trunk/core/src/test/resources/noop-transaction.xml
projects/jboss-jca/trunk/core/src/test/resources/rejecting-workmanager.xml
projects/jboss-jca/trunk/core/src/test/resources/transaction.xml
projects/jboss-jca/trunk/core/src/test/resources/workmanager.xml
Removed:
projects/jboss-jca/trunk/core/src/test/resources/mdr-jboss-beans.xml
projects/jboss-jca/trunk/core/src/test/resources/naming-jboss-beans.xml
projects/jboss-jca/trunk/core/src/test/resources/org/
projects/jboss-jca/trunk/core/src/test/resources/rejecting-workmanager-jboss-beans.xml
projects/jboss-jca/trunk/core/src/test/resources/transaction-jboss-beans.xml
projects/jboss-jca/trunk/core/src/test/resources/txmgr-jboss-beans.xml
projects/jboss-jca/trunk/core/src/test/resources/workmanager-jboss-beans.xml
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/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
Log:
[JBJCA-474] Enhance embedded environment (Part 2)
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-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerTestCase.java 2010-11-30 14:19:06 UTC (rev 109556)
@@ -262,8 +262,8 @@
embedded.startup();
// Deploy Naming and Transaction
- URL naming = TxConnectionManagerTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
- URL transaction = TxConnectionManagerTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL naming = TxConnectionManagerTestCase.class.getClassLoader().getResource("naming.xml");
+ URL transaction = TxConnectionManagerTestCase.class.getClassLoader().getResource("transaction.xml");
embedded.deploy(naming);
embedded.deploy(transaction);
@@ -277,8 +277,8 @@
public static void afterClass() throws Throwable
{
// Undeploy Transaction and Naming
- URL naming = TxConnectionManagerTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
- URL transaction = TxConnectionManagerTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL naming = TxConnectionManagerTestCase.class.getClassLoader().getResource("naming.xml");
+ URL transaction = TxConnectionManagerTestCase.class.getClassLoader().getResource("transaction.xml");
embedded.undeploy(transaction);
embedded.undeploy(naming);
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-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/XATxConnectionManagerTestCase.java 2010-11-30 14:19:06 UTC (rev 109556)
@@ -223,8 +223,8 @@
embedded.startup();
// Deploy Naming and Transaction
- URL naming = XATxConnectionManagerTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
- URL transaction = XATxConnectionManagerTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL naming = XATxConnectionManagerTestCase.class.getClassLoader().getResource("naming.xml");
+ URL transaction = XATxConnectionManagerTestCase.class.getClassLoader().getResource("transaction.xml");
embedded.deploy(naming);
embedded.deploy(transaction);
@@ -238,8 +238,8 @@
public static void afterClass() throws Throwable
{
// Undeploy Transaction and Naming
- URL naming = XATxConnectionManagerTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
- URL transaction = XATxConnectionManagerTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ URL naming = XATxConnectionManagerTestCase.class.getClassLoader().getResource("naming.xml");
+ URL transaction = XATxConnectionManagerTestCase.class.getClassLoader().getResource("transaction.xml");
embedded.undeploy(transaction);
embedded.undeploy(naming);
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-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/workmanager/unit/WorkManagerTestCase.java 2010-11-30 14:19:06 UTC (rev 109556)
@@ -124,11 +124,11 @@
// Deploy Naming, Transaction and WorkManager
URL naming =
- WorkManagerTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkManagerTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkManagerTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkManagerTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkManagerTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkManagerTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.deploy(naming);
embedded.deploy(transaction);
@@ -144,11 +144,11 @@
{
// Undeploy WorkManager, Transaction and Naming
URL naming =
- WorkManagerTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkManagerTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkManagerTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkManagerTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkManagerTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkManagerTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.undeploy(wm);
embedded.undeploy(transaction);
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-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkAdapterTestCase.java 2010-11-30 14:19:06 UTC (rev 109556)
@@ -177,11 +177,11 @@
// Deploy Naming, Transaction and WorkManager
URL naming =
- WorkAdapterTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkAdapterTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkAdapterTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkAdapterTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkAdapterTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkAdapterTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.deploy(naming);
embedded.deploy(transaction);
@@ -197,11 +197,11 @@
{
// Undeploy WorkManager, Transaction and Naming
URL naming =
- WorkAdapterTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkAdapterTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkAdapterTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkAdapterTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkAdapterTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkAdapterTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.undeploy(wm);
embedded.undeploy(transaction);
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-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkListenerTestCase.java 2010-11-30 14:19:06 UTC (rev 109556)
@@ -177,11 +177,11 @@
// Deploy Naming, Transaction and WorkManager
URL naming =
- WorkListenerTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkListenerTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkListenerTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkListenerTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkListenerTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkListenerTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.deploy(naming);
embedded.deploy(transaction);
@@ -197,11 +197,11 @@
{
// Undeploy WorkManager, Transaction and Naming
URL naming =
- WorkListenerTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkListenerTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkListenerTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkListenerTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkListenerTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkListenerTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.undeploy(wm);
embedded.undeploy(transaction);
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-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerDoWorkTestCase.java 2010-11-30 14:19:06 UTC (rev 109556)
@@ -329,11 +329,11 @@
// Deploy Naming, Transaction and WorkManager
URL naming =
- WorkManagerDoWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkManagerDoWorkTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkManagerDoWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkManagerDoWorkTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkManagerDoWorkTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkManagerDoWorkTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.deploy(naming);
embedded.deploy(transaction);
@@ -349,11 +349,11 @@
{
// Undeploy WorkManager, Transaction and Naming
URL naming =
- WorkManagerDoWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkManagerDoWorkTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkManagerDoWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkManagerDoWorkTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkManagerDoWorkTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkManagerDoWorkTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.undeploy(wm);
embedded.undeploy(transaction);
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-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerRejectingDoWorkTestCase.java 2010-11-30 14:19:06 UTC (rev 109556)
@@ -98,11 +98,11 @@
// Deploy Naming, Transaction and WorkManager
URL naming =
- WorkManagerRejectingDoWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkManagerRejectingDoWorkTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkManagerRejectingDoWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkManagerRejectingDoWorkTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkManagerRejectingDoWorkTestCase.class.getClassLoader().getResource("rejecting-workmanager-jboss-beans.xml");
+ WorkManagerRejectingDoWorkTestCase.class.getClassLoader().getResource("rejecting-workmanager.xml");
embedded.deploy(naming);
embedded.deploy(transaction);
@@ -118,11 +118,11 @@
{
// Undeploy WorkManager, Transaction and Naming
URL naming =
- WorkManagerRejectingDoWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkManagerRejectingDoWorkTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkManagerRejectingDoWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkManagerRejectingDoWorkTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkManagerRejectingDoWorkTestCase.class.getClassLoader().getResource("rejecting-workmanager-jboss-beans.xml");
+ WorkManagerRejectingDoWorkTestCase.class.getClassLoader().getResource("rejecting-workmanager.xml");
embedded.undeploy(wm);
embedded.undeploy(transaction);
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-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerRejectingScheduleWorkTestCase.java 2010-11-30 14:19:06 UTC (rev 109556)
@@ -98,12 +98,12 @@
// Deploy Naming, Transaction and WorkManager
URL naming =
- WorkManagerRejectingScheduleWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkManagerRejectingScheduleWorkTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkManagerRejectingScheduleWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkManagerRejectingScheduleWorkTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
WorkManagerRejectingScheduleWorkTestCase.class.getClassLoader().
- getResource("rejecting-workmanager-jboss-beans.xml");
+ getResource("rejecting-workmanager.xml");
embedded.deploy(naming);
embedded.deploy(transaction);
@@ -119,12 +119,12 @@
{
// Undeploy WorkManager, Transaction and Naming
URL naming =
- WorkManagerRejectingScheduleWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkManagerRejectingScheduleWorkTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkManagerRejectingScheduleWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkManagerRejectingScheduleWorkTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
WorkManagerRejectingScheduleWorkTestCase.class.getClassLoader().
- getResource("rejecting-workmanager-jboss-beans.xml");
+ getResource("rejecting-workmanager.xml");
embedded.undeploy(wm);
embedded.undeploy(transaction);
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-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerRejectingStartWorkTestCase.java 2010-11-30 14:19:06 UTC (rev 109556)
@@ -98,12 +98,12 @@
// Deploy Naming, Transaction and WorkManager
URL naming =
- WorkManagerRejectingStartWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkManagerRejectingStartWorkTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkManagerRejectingStartWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkManagerRejectingStartWorkTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
WorkManagerRejectingStartWorkTestCase.class.getClassLoader().
- getResource("rejecting-workmanager-jboss-beans.xml");
+ getResource("rejecting-workmanager.xml");
embedded.deploy(naming);
embedded.deploy(transaction);
@@ -119,12 +119,12 @@
{
// Undeploy WorkManager, Transaction and Naming
URL naming =
- WorkManagerRejectingStartWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkManagerRejectingStartWorkTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkManagerRejectingStartWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkManagerRejectingStartWorkTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
WorkManagerRejectingStartWorkTestCase.class.getClassLoader().
- getResource("rejecting-workmanager-jboss-beans.xml");
+ getResource("rejecting-workmanager.xml");
embedded.undeploy(wm);
embedded.undeploy(transaction);
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-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerScheduleWorkTestCase.java 2010-11-30 14:19:06 UTC (rev 109556)
@@ -408,11 +408,11 @@
// Deploy Naming, Transaction and WorkManager
URL naming =
- WorkManagerScheduleWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkManagerScheduleWorkTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkManagerScheduleWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkManagerScheduleWorkTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkManagerScheduleWorkTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkManagerScheduleWorkTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.deploy(naming);
embedded.deploy(transaction);
@@ -428,11 +428,11 @@
{
// Undeploy WorkManager, Transaction and Naming
URL naming =
- WorkManagerScheduleWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkManagerScheduleWorkTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkManagerScheduleWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkManagerScheduleWorkTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkManagerScheduleWorkTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkManagerScheduleWorkTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.undeploy(wm);
embedded.undeploy(transaction);
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-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerStartWorkTestCase.java 2010-11-30 14:19:06 UTC (rev 109556)
@@ -430,11 +430,11 @@
// Deploy Naming, Transaction and WorkManager
URL naming =
- WorkManagerStartWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkManagerStartWorkTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkManagerStartWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkManagerStartWorkTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkManagerStartWorkTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkManagerStartWorkTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.deploy(naming);
embedded.deploy(transaction);
@@ -450,11 +450,11 @@
{
// Undeploy WorkManager, Transaction and Naming
URL naming =
- WorkManagerStartWorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkManagerStartWorkTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkManagerStartWorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkManagerStartWorkTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkManagerStartWorkTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkManagerStartWorkTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.undeploy(wm);
embedded.undeploy(transaction);
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-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkTestCase.java 2010-11-30 14:19:06 UTC (rev 109556)
@@ -101,11 +101,11 @@
// Deploy Naming, Transaction and WorkManager
URL naming =
- WorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.deploy(naming);
embedded.deploy(transaction);
@@ -121,11 +121,11 @@
{
// Undeploy WorkManager, Transaction and Naming
URL naming =
- WorkTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.undeploy(wm);
embedded.undeploy(transaction);
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-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section1/ManageThreadTestCase.java 2010-11-30 14:19:06 UTC (rev 109556)
@@ -120,11 +120,11 @@
// Deploy Naming, Transaction and WorkManager
URL naming =
- ManageThreadTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ ManageThreadTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- ManageThreadTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ ManageThreadTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- ManageThreadTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ ManageThreadTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.deploy(naming);
embedded.deploy(transaction);
@@ -140,11 +140,11 @@
{
// Undeploy WorkManager, Transaction and Naming
URL naming =
- ManageThreadTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ ManageThreadTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- ManageThreadTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ ManageThreadTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- ManageThreadTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ ManageThreadTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.undeploy(wm);
embedded.undeploy(transaction);
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-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkInterfaceTestCase.java 2010-11-30 14:19:06 UTC (rev 109556)
@@ -207,11 +207,11 @@
// Deploy Naming, Transaction and WorkManager
URL naming =
- WorkInterfaceTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkInterfaceTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkInterfaceTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkInterfaceTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkInterfaceTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkInterfaceTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.deploy(naming);
embedded.deploy(transaction);
@@ -227,11 +227,11 @@
{
// Undeploy WorkManager, Transaction and Naming
URL naming =
- WorkInterfaceTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkInterfaceTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkInterfaceTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkInterfaceTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkInterfaceTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkInterfaceTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.undeploy(wm);
embedded.undeploy(transaction);
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-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkListenerInterfaceTestCase.java 2010-11-30 14:19:06 UTC (rev 109556)
@@ -301,11 +301,11 @@
// Deploy Naming, Transaction and WorkManager
URL naming =
- WorkListenerInterfaceTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkListenerInterfaceTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkListenerInterfaceTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkListenerInterfaceTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkListenerInterfaceTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkListenerInterfaceTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.deploy(naming);
embedded.deploy(transaction);
@@ -321,11 +321,11 @@
{
// Undeploy WorkManager, Transaction and Naming
URL naming =
- WorkListenerInterfaceTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkListenerInterfaceTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkListenerInterfaceTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkListenerInterfaceTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkListenerInterfaceTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkListenerInterfaceTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.undeploy(wm);
embedded.undeploy(transaction);
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-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagementModelTestCase.java 2010-11-30 14:19:06 UTC (rev 109556)
@@ -287,25 +287,20 @@
// Startup
embedded.startup();
- // Deploy Naming, Transaction and WorkManager
+ // Deploy Naming, Transaction, WorkManager and Bootstrap
URL naming =
- WorkManagementModelTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkManagementModelTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkManagementModelTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkManagementModelTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkManagementModelTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkManagementModelTestCase.class.getClassLoader().getResource("workmanager.xml");
+ URL bootstrap =
+ WorkManagementModelTestCase.class.getClassLoader().getResource("bootstrap.xml");
embedded.deploy(naming);
embedded.deploy(transaction);
embedded.deploy(wm);
-
- // Deploy Beans
- String name =
- WorkManagementModelTestCase.class.getName().replace('.', '/') + "-jboss-beans.xml";
- URL beans =
- WorkManagementModelTestCase.class.getClassLoader().getResource(name);
-
- embedded.deploy(beans);
+ embedded.deploy(bootstrap);
}
/**
@@ -315,22 +310,17 @@
@AfterClass
public static void afterClass() throws Throwable
{
- // Undeploy Beans
- String name =
- WorkManagementModelTestCase.class.getName().replace('.', '/') + "-jboss-beans.xml";
- URL beans =
- WorkManagementModelTestCase.class.getClassLoader().getResource(name);
-
- embedded.undeploy(beans);
-
- // Undeploy WorkManager, Transaction and Naming
+ // Undeploy Bootstrap, WorkManager, Transaction and Naming
URL naming =
- WorkManagementModelTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkManagementModelTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkManagementModelTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkManagementModelTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkManagementModelTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkManagementModelTestCase.class.getClassLoader().getResource("workmanager.xml");
+ URL bootstrap =
+ WorkManagementModelTestCase.class.getClassLoader().getResource("bootstrap.xml");
+ embedded.undeploy(bootstrap);
embedded.undeploy(wm);
embedded.undeploy(transaction);
embedded.undeploy(naming);
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-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase.java 2010-11-30 14:19:06 UTC (rev 109556)
@@ -327,23 +327,18 @@
// Deploy Naming, Transaction and WorkManager
URL naming =
- WorkManagerInterfaceTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkManagerInterfaceTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkManagerInterfaceTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkManagerInterfaceTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkManagerInterfaceTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkManagerInterfaceTestCase.class.getClassLoader().getResource("workmanager.xml");
+ URL bootstrap =
+ WorkManagerInterfaceTestCase.class.getClassLoader().getResource("bootstrap.xml");
embedded.deploy(naming);
embedded.deploy(transaction);
embedded.deploy(wm);
-
- // Deploy Beans
- String name =
- WorkManagerInterfaceTestCase.class.getName().replace('.', '/') + "-jboss-beans.xml";
- URL beans =
- WorkManagerInterfaceTestCase.class.getClassLoader().getResource(name);
-
- embedded.deploy(beans);
+ embedded.deploy(bootstrap);
}
/**
@@ -353,22 +348,17 @@
@AfterClass
public static void afterClass() throws Throwable
{
- // Undeploy Beans
- String name =
- WorkManagerInterfaceTestCase.class.getName().replace('.', '/') + "-jboss-beans.xml";
- URL beans =
- WorkManagerInterfaceTestCase.class.getClassLoader().getResource(name);
-
- embedded.deploy(beans);
-
- // Undeploy WorkManager, Transaction and Naming
+ // Undeploy Bootstrap, WorkManager, Transaction and Naming
URL naming =
- WorkManagerInterfaceTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkManagerInterfaceTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkManagerInterfaceTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkManagerInterfaceTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkManagerInterfaceTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkManagerInterfaceTestCase.class.getClassLoader().getResource("workmanager.xml");
+ URL bootstrap =
+ WorkManagerInterfaceTestCase.class.getClassLoader().getResource("bootstrap.xml");
+ embedded.undeploy(bootstrap);
embedded.undeploy(wm);
embedded.undeploy(transaction);
embedded.undeploy(naming);
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-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/api/WorkContextProviderGetWorkContextsTestCase.java 2010-11-30 14:19:06 UTC (rev 109556)
@@ -75,11 +75,11 @@
// Deploy Naming, Transaction and WorkManager
URL naming =
- WorkContextProviderGetWorkContextsTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkContextProviderGetWorkContextsTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkContextProviderGetWorkContextsTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkContextProviderGetWorkContextsTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkContextProviderGetWorkContextsTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkContextProviderGetWorkContextsTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.deploy(naming);
embedded.deploy(transaction);
@@ -94,11 +94,11 @@
public static void afterClass() throws Throwable
{
URL naming =
- WorkContextProviderGetWorkContextsTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkContextProviderGetWorkContextsTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkContextProviderGetWorkContextsTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkContextProviderGetWorkContextsTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkContextProviderGetWorkContextsTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkContextProviderGetWorkContextsTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.undeploy(wm);
embedded.undeploy(transaction);
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-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/section4/subsection3/WorkContextHandlingAssignmentTestCase.java 2010-11-30 14:19:06 UTC (rev 109556)
@@ -109,11 +109,11 @@
// Deploy Naming, Transaction and WorkManager
URL naming =
- WorkContextHandlingAssignmentTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkContextHandlingAssignmentTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkContextHandlingAssignmentTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkContextHandlingAssignmentTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkContextHandlingAssignmentTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkContextHandlingAssignmentTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.deploy(naming);
embedded.deploy(transaction);
@@ -129,11 +129,11 @@
public static void afterClass() throws Throwable
{
URL naming =
- WorkContextHandlingAssignmentTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ WorkContextHandlingAssignmentTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkContextHandlingAssignmentTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
+ WorkContextHandlingAssignmentTestCase.class.getClassLoader().getResource("transaction.xml");
URL wm =
- WorkContextHandlingAssignmentTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkContextHandlingAssignmentTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.undeploy(wm);
embedded.undeploy(transaction);
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-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/section5/TransactionContextTestCase.java 2010-11-30 14:19:06 UTC (rev 109556)
@@ -74,9 +74,9 @@
embedded.startup();
// Deploy Naming, Transaction and WorkManager
- 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");
+ URL naming = TransactionContextTestCase.class.getClassLoader().getResource("naming.xml");
+ URL transaction = TransactionContextTestCase.class.getClassLoader().getResource("transaction.xml");
+ URL wm = TransactionContextTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.deploy(naming);
embedded.deploy(transaction);
@@ -91,9 +91,9 @@
@AfterClass
public static void afterClass() throws Throwable
{
- 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");
+ URL naming = TransactionContextTestCase.class.getClassLoader().getResource("naming.xml");
+ URL transaction = TransactionContextTestCase.class.getClassLoader().getResource("transaction.xml");
+ URL wm = TransactionContextTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.undeploy(wm);
embedded.undeploy(transaction);
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-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter11/section7/WorkContextSetupListenerTestCase.java 2010-11-30 14:19:06 UTC (rev 109556)
@@ -111,10 +111,10 @@
embedded.startup();
// Deploy Naming, Transaction and WorkManager
- URL naming = WorkContextSetupListenerTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL naming = WorkContextSetupListenerTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkContextSetupListenerTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
- URL wm = WorkContextSetupListenerTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkContextSetupListenerTestCase.class.getClassLoader().getResource("transaction.xml");
+ URL wm = WorkContextSetupListenerTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.deploy(naming);
embedded.deploy(transaction);
@@ -129,10 +129,10 @@
@AfterClass
public static void afterClass() throws Throwable
{
- URL naming = WorkContextSetupListenerTestCase.class.getClassLoader().getResource("naming-jboss-beans.xml");
+ URL naming = WorkContextSetupListenerTestCase.class.getClassLoader().getResource("naming.xml");
URL transaction =
- WorkContextSetupListenerTestCase.class.getClassLoader().getResource("transaction-jboss-beans.xml");
- URL wm = WorkContextSetupListenerTestCase.class.getClassLoader().getResource("workmanager-jboss-beans.xml");
+ WorkContextSetupListenerTestCase.class.getClassLoader().getResource("transaction.xml");
+ URL wm = WorkContextSetupListenerTestCase.class.getClassLoader().getResource("workmanager.xml");
embedded.undeploy(wm);
embedded.undeploy(transaction);
Added: projects/jboss-jca/trunk/core/src/test/resources/bootstrap.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/bootstrap.xml (rev 0)
+++ projects/jboss-jca/trunk/core/src/test/resources/bootstrap.xml 2010-11-30 14:19:06 UTC (rev 109556)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment>
+
+ <bean name="SimpleBootstrapContext" interface="javax.resource.spi.BootstrapContext" class="org.jboss.jca.test.core.spec.chapter10.SimpleBootstrapContext">
+ <!-- The work manager -->
+ <property name="workManager"><inject bean="WorkManager"/></property>
+
+ <!-- The XA terminator -->
+ <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
+ </bean>
+</deployment>
Deleted: projects/jboss-jca/trunk/core/src/test/resources/mdr-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/mdr-jboss-beans.xml 2010-11-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/resources/mdr-jboss-beans.xml 2010-11-30 14:19:06 UTC (rev 109556)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment>
-
- <bean name="MetaDataRepository" interface="org.jboss.jca.core.api.MetaDataRepository" class="org.jboss.jca.core.mdr.MetaDataRepositoryImpl">
- </bean>
-
-</deployment>
Deleted: projects/jboss-jca/trunk/core/src/test/resources/naming-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/naming-jboss-beans.xml 2010-11-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/resources/naming-jboss-beans.xml 2010-11-30 14:19:06 UTC (rev 109556)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment>
-
- <!-- Naming -->
- <bean name="NamingServer" class="org.jnp.server.SingletonNamingServer"/>
-
- <!-- java:comp -->
- <bean name="JavaCompInitializer" class="org.jboss.jca.core.common.JavaCompInitializer">
- <depends>NamingServer</depends>
- </bean>
-
-</deployment>
Copied: projects/jboss-jca/trunk/core/src/test/resources/naming.xml (from rev 109543, projects/jboss-jca/trunk/core/src/test/resources/naming-jboss-beans.xml)
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/naming.xml (rev 0)
+++ projects/jboss-jca/trunk/core/src/test/resources/naming.xml 2010-11-30 14:19:06 UTC (rev 109556)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment>
+
+ <!-- Naming -->
+ <bean name="NamingServer" class="org.jnp.server.SingletonNamingServer"/>
+
+ <!-- java:comp -->
+ <bean name="JavaCompInitializer" class="org.jboss.jca.core.common.JavaCompInitializer">
+ <depends>NamingServer</depends>
+ </bean>
+
+</deployment>
Copied: projects/jboss-jca/trunk/core/src/test/resources/noop-transaction.xml (from rev 109543, projects/jboss-jca/trunk/core/src/test/resources/txmgr-jboss-beans.xml)
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/noop-transaction.xml (rev 0)
+++ projects/jboss-jca/trunk/core/src/test/resources/noop-transaction.xml 2010-11-30 14:19:06 UTC (rev 109556)
@@ -0,0 +1,51 @@
+<deployment>
+
+ <!-- Transaction registry -->
+ <bean name="TxRegistry"
+ class="org.jboss.jca.test.txmgr.TxRegistry">
+ </bean>
+
+ <!-- User transaction registry -->
+ <bean name="UserTxRegistry"
+ class="org.jboss.jca.test.txmgr.TxRegistry">
+ </bean>
+
+ <!-- XATerminator -->
+ <bean name="XATerminator"
+ interface="org.jboss.tm.JBossXATerminator"
+ class="org.jboss.jca.test.txmgr.JBossXATerminatorImpl">
+ </bean>
+
+ <!-- Transaction manager -->
+ <bean name="TransactionManager"
+ interface="javax.transaction.TransactionManager"
+ class="org.jboss.jca.test.txmgr.TransactionManagerImpl">
+ <property name="Registry"><inject bean="TxRegistry"/></property>
+ <property name="XATerminator"><inject bean="XATerminator"/></property>
+ </bean>
+
+ <!-- Real Transaction manager -->
+ <bean name="RealTransactionManager"
+ interface="javax.transaction.TransactionManager"
+ class="org.jboss.jca.test.txmgr.RealTransactionManagerImpl">
+ <property name="Registry"><inject bean="TxRegistry"/></property>
+ <depends>NamingServer</depends>
+ </bean>
+
+ <!-- TransactionSynchronizationRegistry -->
+ <bean name="TransactionSynchronizationRegistry"
+ interface="javax.transaction.TransactionSynchronizationRegistry"
+ class="org.jboss.jca.test.txmgr.TransactionSynchronizationRegistryImpl">
+ <property name="Registry"><inject bean="TxRegistry"/></property>
+ <depends>NamingServer</depends>
+ </bean>
+
+ <!-- UserTransaction -->
+ <bean name="UserTransaction"
+ interface="javax.transaction.UserTransaction"
+ class="org.jboss.jca.test.txmgr.UserTransactionImpl">
+ <property name="Registry"><inject bean="UserTxRegistry"/></property>
+ <depends>NamingServer</depends>
+ </bean>
+
+</deployment>
Deleted: projects/jboss-jca/trunk/core/src/test/resources/rejecting-workmanager-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/rejecting-workmanager-jboss-beans.xml 2010-11-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/resources/rejecting-workmanager-jboss-beans.xml 2010-11-30 14:19:06 UTC (rev 109556)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment>
-
- <!-- Short running thread pool -->
- <bean name="ShortRunningThreadPool">
- <constructor factoryMethod="blockingRejectingExecutor"
- factoryClass="org.jboss.threads.JBossExecutors"/>
- </bean>
-
- <!-- Long running thread pool -->
- <bean name="LongRunningThreadPool">
- <constructor factoryMethod="blockingRejectingExecutor"
- factoryClass="org.jboss.threads.JBossExecutors"/>
- </bean>
-
- <!-- Work Manager -->
- <bean name="WorkManager"
- interface="org.jboss.jca.core.api.WorkManager"
- class="org.jboss.jca.core.workmanager.WorkManagerImpl">
-
- <!-- The short running thread pool -->
- <property name="ShortRunningThreadPool"><inject bean="ShortRunningThreadPool"/></property>
-
- <!-- The long running thread pool -->
- <property name="LongRunningThreadPool"><inject bean="LongRunningThreadPool"/></property>
-
- <!-- The XA terminator -->
- <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
- </bean>
-
-</deployment>
Copied: projects/jboss-jca/trunk/core/src/test/resources/rejecting-workmanager.xml (from rev 109543, projects/jboss-jca/trunk/core/src/test/resources/rejecting-workmanager-jboss-beans.xml)
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/rejecting-workmanager.xml (rev 0)
+++ projects/jboss-jca/trunk/core/src/test/resources/rejecting-workmanager.xml 2010-11-30 14:19:06 UTC (rev 109556)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment>
+
+ <!-- Short running thread pool -->
+ <bean name="ShortRunningThreadPool">
+ <constructor factoryMethod="blockingRejectingExecutor"
+ factoryClass="org.jboss.threads.JBossExecutors"/>
+ </bean>
+
+ <!-- Long running thread pool -->
+ <bean name="LongRunningThreadPool">
+ <constructor factoryMethod="blockingRejectingExecutor"
+ factoryClass="org.jboss.threads.JBossExecutors"/>
+ </bean>
+
+ <!-- Work Manager -->
+ <bean name="WorkManager"
+ interface="org.jboss.jca.core.api.WorkManager"
+ class="org.jboss.jca.core.workmanager.WorkManagerImpl">
+
+ <!-- The short running thread pool -->
+ <property name="ShortRunningThreadPool"><inject bean="ShortRunningThreadPool"/></property>
+
+ <!-- The long running thread pool -->
+ <property name="LongRunningThreadPool"><inject bean="LongRunningThreadPool"/></property>
+
+ <!-- The XA terminator -->
+ <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
+ </bean>
+
+</deployment>
Deleted: projects/jboss-jca/trunk/core/src/test/resources/transaction-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/transaction-jboss-beans.xml 2010-11-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/resources/transaction-jboss-beans.xml 2010-11-30 14:19:06 UTC (rev 109556)
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment>
-
- <bean name="RecoveryEnvironmentBean" class="com.arjuna.ats.arjuna.common.RecoveryEnvironmentBean">
- <constructor factoryClass="com.arjuna.ats.arjuna.common.recoveryPropertyManager" factoryMethod="getRecoveryEnvironmentBean"/>
- <property name="recoveryInetAddress">localhost</property>
- <property name="recoveryPort">4712</property>
- <property name="transactionStatusManagerInetAddress">localhost</property>
- <property name="transactionStatusManagerPort">4713</property>
- <property name="recoveryExtensions">
- <list elementClass="java.lang.String">
- <value>com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule</value>
- <value>com.arjuna.ats.internal.txoj.recovery.TORecoveryModule</value>
- <value>com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule</value>
- </list>
- </property>
- <property name="expiryScanners">
- <list elementClass="java.lang.String">
- <value>com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner</value>
- </list>
- </property>
- <property name="recoveryActivators">
- <null/>
- </property>
- </bean>
-
- <bean name="CoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.CoreEnvironmentBean">
- <constructor factoryClass="com.arjuna.ats.arjuna.common.arjPropertyManager" factoryMethod="getCoreEnvironmentBean"/>
- <property name="socketProcessIdPort">0</property>
- <property name="nodeIdentifier">1</property>
- <property name="socketProcessIdMaxPorts">10</property>
- </bean>
-
- <bean name="CoordinatorEnvironmentBean" class="com.arjuna.ats.arjuna.common.CoordinatorEnvironmentBean">
- <constructor factoryClass="com.arjuna.ats.arjuna.common.arjPropertyManager" factoryMethod="getCoordinatorEnvironmentBean"/>
- <property name="enableStatistics">false</property>
- <property name="defaultTimeout">300</property>
- </bean>
-
- <bean name="ActionStoreObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
- <constructor factoryClass="com.arjuna.common.internal.util.propertyservice.BeanPopulator" factoryMethod="getNamedInstance">
- <parameter>com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean</parameter>
- <parameter>default</parameter>
- </constructor>
- <property name="objectStoreDir">${iron.jacamar.home}/tmp/tx-object-store</property>
- </bean>
-
- <bean name="StateStoreObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
- <constructor factoryClass="com.arjuna.common.internal.util.propertyservice.BeanPopulator" factoryMethod="getNamedInstance">
- <parameter>com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean</parameter>
- <parameter>stateStore</parameter>
- </constructor>
- <property name="objectStoreDir">${iron.jacamar.home}/tmp/tx-object-store</property>
- </bean>
-
- <bean name="CommunicationStoreObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
- <constructor factoryClass="com.arjuna.common.internal.util.propertyservice.BeanPopulator" factoryMethod="getNamedInstance">
- <parameter>com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean</parameter>
- <parameter>communicationStore</parameter>
- </constructor>
- <property name="objectStoreDir">${iron.jacamar.home}/tmp/tx-object-store</property>
- </bean>
-
- <bean name="ObjectStoreBrowserBean" class="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBrowser">
- <property name="types">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>StateManager/BasicAction/TwoPhaseCoordinator/AtomicAction</key>
- <value>com.arjuna.ats.internal.jta.tools.osb.mbean.jta.JTAActionBean</value>
- </entry>
- </map>
- </property>
- <depends>ActionStoreObjectStoreEnvironmentBean</depends>
- </bean>
-
- <bean name="JTAEnvironmentBean" class="com.arjuna.ats.jta.common.JTAEnvironmentBean">
- <constructor factoryClass="com.arjuna.ats.jta.common.jtaPropertyManager" factoryMethod="getJTAEnvironmentBean"/>
- <property name="lastResourceOptimisationInterface">org.jboss.tm.LastResource</property>
- <property name="transactionManagerClassName">com.arjuna.ats.jbossatx.jta.TransactionManagerDelegate</property>
- <property name="userTransactionClassName">com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple</property>
- <property name="transactionSynchronizationRegistryClassName">com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionSynchronizationRegistryImple</property>
- <property name="xaRecoveryNodes">
- <list elementClass="java.lang.String">
- <value>1</value>
- </list>
- </property>
- <property name="xaResourceOrphanFilterClassNames">
- <list elementClass="java.lang.String">
- <value>com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter</value>
- <value>com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter</value>
- </list>
- </property>
- </bean>
-
- <bean name="RecoveryManager" class="com.arjuna.ats.jbossatx.jta.RecoveryManagerService">
- <depends>RecoveryEnvironmentBean</depends>
- <depends>ActionStoreObjectStoreEnvironmentBean</depends>
- <depends>StateStoreObjectStoreEnvironmentBean</depends>
- <depends>CommunicationStoreObjectStoreEnvironmentBean</depends>
- </bean>
-
- <bean name="XATerminator" class="com.arjuna.ats.internal.jbossatx.jta.jca.XATerminator"/>
-
- <bean name="TransactionSynchronizationRegistry" class="com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionSynchronizationRegistryImple"/>
-
- <bean name="TransactionManager" class="com.arjuna.ats.jbossatx.jta.TransactionManagerService">
- <property name="jbossXATerminator"><inject bean="XATerminator"/></property>
- <property name="transactionSynchronizationRegistry"><inject bean="TransactionSynchronizationRegistry"/></property>
- <depends>RecoveryEnvironmentBean</depends>
- <depends>CoreEnvironmentBean</depends>
- <depends>CoordinatorEnvironmentBean</depends>
- <depends>JTAEnvironmentBean</depends>
- <depends>RecoveryManager</depends>
- <depends>TransactionManagerJNDIBinding</depends>
- <depends>TransactionSynchronizationRegistryJNDIBinding</depends>
- <depends>TransactionPropagationContextImporterJNDIBinding</depends>
- <depends>TransactionPropagationContextExporterJNDIBinding</depends>
- <depends>ActionStoreObjectStoreEnvironmentBean</depends>
- <depends>StateStoreObjectStoreEnvironmentBean</depends>
- <depends>CommunicationStoreObjectStoreEnvironmentBean</depends>
- </bean>
-
- <bean name="TransactionStatistics" class="com.arjuna.ats.arjuna.coordinator.TxStats">
- <constructor factoryClass="com.arjuna.ats.arjuna.coordinator.TxStats" factoryMethod="getInstance"/>
- </bean>
-
- <bean name="TransactionManagerJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
- <property name="bindName">java:/TransactionManager</property>
- <property name="className">
- <inject bean="JTAEnvironmentBean" property="transactionManagerClassName"/>
- </property>
- <property name="factory">
- <inject bean="JTAEnvironmentBean" property="transactionManagerClassName"/>
- </property>
-
- <install method="bind"/>
- <uninstall method="unbind"/>
-
- <depends>NamingServer</depends>
- </bean>
-
- <bean name="TransactionSynchronizationRegistryJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
- <property name="bindName">java:/TransactionSynchronizationRegistry</property>
- <property name="className">
- <inject bean="JTAEnvironmentBean" property="transactionSynchronizationRegistryClassName"/>
- </property>
- <property name="factory">
- <inject bean="JTAEnvironmentBean" property="transactionSynchronizationRegistryClassName"/>
- </property>
-
- <install method="bind"/>
- <uninstall method="unbind"/>
-
- <depends>NamingServer</depends>
- </bean>
-
- <bean name="TransactionPropagationContextImporterJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
- <property name="bindName">java:/TransactionPropagationContextImporter</property>
- <property name="className">com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager</property>
- <property name="factory">com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager</property>
-
- <install method="bind"/>
- <uninstall method="unbind"/>
-
- <depends>NamingServer</depends>
- </bean>
-
- <bean name="TransactionPropagationContextExporterJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
- <property name="bindName">java:/TransactionPropagationContextExporter</property>
- <property name="className">com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager</property>
- <property name="factory">com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager</property>
-
- <install method="bind"/>
- <uninstall method="unbind"/>
-
- <depends>NamingServer</depends>
- </bean>
-
- <!-- Ensure TransactionPropagationContextUtil's ref to TransactionPropagationContextFactory is set. See JBAS-7784. -->
- <bean name="TransactionPropagationContextFactory" class="org.jboss.tm.TransactionPropagationContextFactory">
- <constructor factoryClass="org.jboss.tm.TransactionPropagationContextUtil" factoryMethod="getTPCFactory"/>
- <!-- The factory method looks up the JNDI binding, so we depend on it -->
- <depends>TransactionPropagationContextExporterJNDIBinding</depends>
- </bean>
-
- <!-- Make javax.transaction.TransactionManager available for injection -->
- <bean name="RealTransactionManager">
- <constructor factoryMethod="getTransactionManager">
- <factory bean="TransactionManager"/>
- </constructor>
- </bean>
-
- <!-- Handles user transaction providers and listeners -->
- <bean name="UserTransactionRegistry" class="org.jboss.tm.usertx.UserTransactionRegistry">
- <!-- Register providers -->
- <incallback method="addProvider"/>
- <uncallback method="removeProvider"/>
-
- <!-- Register listeners -->
- <incallback method="addListener"/>
- <uncallback method="removeListener"/>
- </bean>
-
- <!-- The provider for default in process UserTransactions -->
- <bean name="DefaultUserTransactionprovider" class="org.jboss.tm.usertx.client.ServerVMClientUserTransaction">
- <constructor factoryClass="org.jboss.tm.usertx.client.ServerVMClientUserTransaction" factoryMethod="getSingleton"/>
- <depends>TransactionManager</depends>
- </bean>
-
- <!-- Bind java:/UserTransaction -->
- <bean name="UserTransactionJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
- <property name="bindName">java:/UserTransaction</property>
- <property name="className">
- <inject bean="JTAEnvironmentBean" property="userTransactionClassName"/>
- </property>
- <property name="factory">
- <inject bean="JTAEnvironmentBean" property="userTransactionClassName"/>
- </property>
-
- <install method="bind"/>
- <uninstall method="unbind"/>
-
- <depends>NamingServer</depends>
- </bean>
-
-</deployment>
Copied: projects/jboss-jca/trunk/core/src/test/resources/transaction.xml (from rev 109543, projects/jboss-jca/trunk/core/src/test/resources/transaction-jboss-beans.xml)
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/transaction.xml (rev 0)
+++ projects/jboss-jca/trunk/core/src/test/resources/transaction.xml 2010-11-30 14:19:06 UTC (rev 109556)
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment>
+
+ <bean name="RecoveryEnvironmentBean" class="com.arjuna.ats.arjuna.common.RecoveryEnvironmentBean">
+ <constructor factoryClass="com.arjuna.ats.arjuna.common.recoveryPropertyManager" factoryMethod="getRecoveryEnvironmentBean"/>
+ <property name="recoveryInetAddress">localhost</property>
+ <property name="recoveryPort">4712</property>
+ <property name="transactionStatusManagerInetAddress">localhost</property>
+ <property name="transactionStatusManagerPort">4713</property>
+ <property name="recoveryExtensions">
+ <list elementClass="java.lang.String">
+ <value>com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule</value>
+ <value>com.arjuna.ats.internal.txoj.recovery.TORecoveryModule</value>
+ <value>com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule</value>
+ </list>
+ </property>
+ <property name="expiryScanners">
+ <list elementClass="java.lang.String">
+ <value>com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner</value>
+ </list>
+ </property>
+ <property name="recoveryActivators">
+ <null/>
+ </property>
+ </bean>
+
+ <bean name="CoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.CoreEnvironmentBean">
+ <constructor factoryClass="com.arjuna.ats.arjuna.common.arjPropertyManager" factoryMethod="getCoreEnvironmentBean"/>
+ <property name="socketProcessIdPort">0</property>
+ <property name="nodeIdentifier">1</property>
+ <property name="socketProcessIdMaxPorts">10</property>
+ </bean>
+
+ <bean name="CoordinatorEnvironmentBean" class="com.arjuna.ats.arjuna.common.CoordinatorEnvironmentBean">
+ <constructor factoryClass="com.arjuna.ats.arjuna.common.arjPropertyManager" factoryMethod="getCoordinatorEnvironmentBean"/>
+ <property name="enableStatistics">false</property>
+ <property name="defaultTimeout">300</property>
+ </bean>
+
+ <bean name="ActionStoreObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
+ <constructor factoryClass="com.arjuna.common.internal.util.propertyservice.BeanPopulator" factoryMethod="getNamedInstance">
+ <parameter>com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean</parameter>
+ <parameter>default</parameter>
+ </constructor>
+ <property name="objectStoreDir">${iron.jacamar.home}/tmp/tx-object-store</property>
+ </bean>
+
+ <bean name="StateStoreObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
+ <constructor factoryClass="com.arjuna.common.internal.util.propertyservice.BeanPopulator" factoryMethod="getNamedInstance">
+ <parameter>com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean</parameter>
+ <parameter>stateStore</parameter>
+ </constructor>
+ <property name="objectStoreDir">${iron.jacamar.home}/tmp/tx-object-store</property>
+ </bean>
+
+ <bean name="CommunicationStoreObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
+ <constructor factoryClass="com.arjuna.common.internal.util.propertyservice.BeanPopulator" factoryMethod="getNamedInstance">
+ <parameter>com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean</parameter>
+ <parameter>communicationStore</parameter>
+ </constructor>
+ <property name="objectStoreDir">${iron.jacamar.home}/tmp/tx-object-store</property>
+ </bean>
+
+ <bean name="ObjectStoreBrowserBean" class="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBrowser">
+ <property name="types">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry>
+ <key>StateManager/BasicAction/TwoPhaseCoordinator/AtomicAction</key>
+ <value>com.arjuna.ats.internal.jta.tools.osb.mbean.jta.JTAActionBean</value>
+ </entry>
+ </map>
+ </property>
+ <depends>ActionStoreObjectStoreEnvironmentBean</depends>
+ </bean>
+
+ <bean name="JTAEnvironmentBean" class="com.arjuna.ats.jta.common.JTAEnvironmentBean">
+ <constructor factoryClass="com.arjuna.ats.jta.common.jtaPropertyManager" factoryMethod="getJTAEnvironmentBean"/>
+ <property name="lastResourceOptimisationInterface">org.jboss.tm.LastResource</property>
+ <property name="transactionManagerClassName">com.arjuna.ats.jbossatx.jta.TransactionManagerDelegate</property>
+ <property name="userTransactionClassName">com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple</property>
+ <property name="transactionSynchronizationRegistryClassName">com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionSynchronizationRegistryImple</property>
+ <property name="xaRecoveryNodes">
+ <list elementClass="java.lang.String">
+ <value>1</value>
+ </list>
+ </property>
+ <property name="xaResourceOrphanFilterClassNames">
+ <list elementClass="java.lang.String">
+ <value>com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter</value>
+ <value>com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter</value>
+ </list>
+ </property>
+ </bean>
+
+ <bean name="RecoveryManager" class="com.arjuna.ats.jbossatx.jta.RecoveryManagerService">
+ <depends>RecoveryEnvironmentBean</depends>
+ <depends>ActionStoreObjectStoreEnvironmentBean</depends>
+ <depends>StateStoreObjectStoreEnvironmentBean</depends>
+ <depends>CommunicationStoreObjectStoreEnvironmentBean</depends>
+ </bean>
+
+ <bean name="XATerminator" class="com.arjuna.ats.internal.jbossatx.jta.jca.XATerminator"/>
+
+ <bean name="TransactionSynchronizationRegistry" class="com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionSynchronizationRegistryImple"/>
+
+ <bean name="TransactionManager" class="com.arjuna.ats.jbossatx.jta.TransactionManagerService">
+ <property name="jbossXATerminator"><inject bean="XATerminator"/></property>
+ <property name="transactionSynchronizationRegistry"><inject bean="TransactionSynchronizationRegistry"/></property>
+ <depends>RecoveryEnvironmentBean</depends>
+ <depends>CoreEnvironmentBean</depends>
+ <depends>CoordinatorEnvironmentBean</depends>
+ <depends>JTAEnvironmentBean</depends>
+ <depends>RecoveryManager</depends>
+ <depends>TransactionManagerJNDIBinding</depends>
+ <depends>TransactionSynchronizationRegistryJNDIBinding</depends>
+ <depends>TransactionPropagationContextImporterJNDIBinding</depends>
+ <depends>TransactionPropagationContextExporterJNDIBinding</depends>
+ <depends>ActionStoreObjectStoreEnvironmentBean</depends>
+ <depends>StateStoreObjectStoreEnvironmentBean</depends>
+ <depends>CommunicationStoreObjectStoreEnvironmentBean</depends>
+ </bean>
+
+ <bean name="TransactionStatistics" class="com.arjuna.ats.arjuna.coordinator.TxStats">
+ <constructor factoryClass="com.arjuna.ats.arjuna.coordinator.TxStats" factoryMethod="getInstance"/>
+ </bean>
+
+ <bean name="TransactionManagerJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
+ <property name="bindName">java:/TransactionManager</property>
+ <property name="className">
+ <inject bean="JTAEnvironmentBean" property="transactionManagerClassName"/>
+ </property>
+ <property name="factory">
+ <inject bean="JTAEnvironmentBean" property="transactionManagerClassName"/>
+ </property>
+
+ <install method="bind"/>
+ <uninstall method="unbind"/>
+
+ <depends>NamingServer</depends>
+ </bean>
+
+ <bean name="TransactionSynchronizationRegistryJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
+ <property name="bindName">java:/TransactionSynchronizationRegistry</property>
+ <property name="className">
+ <inject bean="JTAEnvironmentBean" property="transactionSynchronizationRegistryClassName"/>
+ </property>
+ <property name="factory">
+ <inject bean="JTAEnvironmentBean" property="transactionSynchronizationRegistryClassName"/>
+ </property>
+
+ <install method="bind"/>
+ <uninstall method="unbind"/>
+
+ <depends>NamingServer</depends>
+ </bean>
+
+ <bean name="TransactionPropagationContextImporterJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
+ <property name="bindName">java:/TransactionPropagationContextImporter</property>
+ <property name="className">com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager</property>
+ <property name="factory">com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager</property>
+
+ <install method="bind"/>
+ <uninstall method="unbind"/>
+
+ <depends>NamingServer</depends>
+ </bean>
+
+ <bean name="TransactionPropagationContextExporterJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
+ <property name="bindName">java:/TransactionPropagationContextExporter</property>
+ <property name="className">com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager</property>
+ <property name="factory">com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager</property>
+
+ <install method="bind"/>
+ <uninstall method="unbind"/>
+
+ <depends>NamingServer</depends>
+ </bean>
+
+ <!-- Ensure TransactionPropagationContextUtil's ref to TransactionPropagationContextFactory is set. See JBAS-7784. -->
+ <bean name="TransactionPropagationContextFactory" class="org.jboss.tm.TransactionPropagationContextFactory">
+ <constructor factoryClass="org.jboss.tm.TransactionPropagationContextUtil" factoryMethod="getTPCFactory"/>
+ <!-- The factory method looks up the JNDI binding, so we depend on it -->
+ <depends>TransactionPropagationContextExporterJNDIBinding</depends>
+ </bean>
+
+ <!-- Make javax.transaction.TransactionManager available for injection -->
+ <bean name="RealTransactionManager">
+ <constructor factoryMethod="getTransactionManager">
+ <factory bean="TransactionManager"/>
+ </constructor>
+ </bean>
+
+ <!-- Handles user transaction providers and listeners -->
+ <bean name="UserTransactionRegistry" class="org.jboss.tm.usertx.UserTransactionRegistry">
+ <!-- Register providers -->
+ <incallback method="addProvider"/>
+ <uncallback method="removeProvider"/>
+
+ <!-- Register listeners -->
+ <incallback method="addListener"/>
+ <uncallback method="removeListener"/>
+ </bean>
+
+ <!-- The provider for default in process UserTransactions -->
+ <bean name="DefaultUserTransactionprovider" class="org.jboss.tm.usertx.client.ServerVMClientUserTransaction">
+ <constructor factoryClass="org.jboss.tm.usertx.client.ServerVMClientUserTransaction" factoryMethod="getSingleton"/>
+ <depends>TransactionManager</depends>
+ </bean>
+
+ <!-- Bind java:/UserTransaction -->
+ <bean name="UserTransactionJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
+ <property name="bindName">java:/UserTransaction</property>
+ <property name="className">
+ <inject bean="JTAEnvironmentBean" property="userTransactionClassName"/>
+ </property>
+ <property name="factory">
+ <inject bean="JTAEnvironmentBean" property="userTransactionClassName"/>
+ </property>
+
+ <install method="bind"/>
+ <uninstall method="unbind"/>
+
+ <depends>NamingServer</depends>
+ </bean>
+
+</deployment>
Deleted: projects/jboss-jca/trunk/core/src/test/resources/txmgr-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/txmgr-jboss-beans.xml 2010-11-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/resources/txmgr-jboss-beans.xml 2010-11-30 14:19:06 UTC (rev 109556)
@@ -1,51 +0,0 @@
-<deployment>
-
- <!-- Transaction registry -->
- <bean name="TxRegistry"
- class="org.jboss.jca.test.txmgr.TxRegistry">
- </bean>
-
- <!-- User transaction registry -->
- <bean name="UserTxRegistry"
- class="org.jboss.jca.test.txmgr.TxRegistry">
- </bean>
-
- <!-- XATerminator -->
- <bean name="XATerminator"
- interface="org.jboss.tm.JBossXATerminator"
- class="org.jboss.jca.test.txmgr.JBossXATerminatorImpl">
- </bean>
-
- <!-- Transaction manager -->
- <bean name="TransactionManager"
- interface="javax.transaction.TransactionManager"
- class="org.jboss.jca.test.txmgr.TransactionManagerImpl">
- <property name="Registry"><inject bean="TxRegistry"/></property>
- <property name="XATerminator"><inject bean="XATerminator"/></property>
- </bean>
-
- <!-- Real Transaction manager -->
- <bean name="RealTransactionManager"
- interface="javax.transaction.TransactionManager"
- class="org.jboss.jca.test.txmgr.RealTransactionManagerImpl">
- <property name="Registry"><inject bean="TxRegistry"/></property>
- <depends>NamingServer</depends>
- </bean>
-
- <!-- TransactionSynchronizationRegistry -->
- <bean name="TransactionSynchronizationRegistry"
- interface="javax.transaction.TransactionSynchronizationRegistry"
- class="org.jboss.jca.test.txmgr.TransactionSynchronizationRegistryImpl">
- <property name="Registry"><inject bean="TxRegistry"/></property>
- <depends>NamingServer</depends>
- </bean>
-
- <!-- UserTransaction -->
- <bean name="UserTransaction"
- interface="javax.transaction.UserTransaction"
- class="org.jboss.jca.test.txmgr.UserTransactionImpl">
- <property name="Registry"><inject bean="UserTxRegistry"/></property>
- <depends>NamingServer</depends>
- </bean>
-
-</deployment>
Deleted: projects/jboss-jca/trunk/core/src/test/resources/workmanager-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/workmanager-jboss-beans.xml 2010-11-30 11:51:23 UTC (rev 109555)
+++ projects/jboss-jca/trunk/core/src/test/resources/workmanager-jboss-beans.xml 2010-11-30 14:19:06 UTC (rev 109556)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment>
-
- <!-- Thread group -->
- <bean name="ThreadGroup"
- class="java.lang.ThreadGroup">
- <constructor>
- <parameter>workmanager</parameter>
- </constructor>
- <ignoreStop/>
- <ignoreDestroy/>
- </bean>
-
- <!-- Thread factory -->
- <bean name="ThreadFactory"
- interface="java.util.concurrent.ThreadFactory"
- class="org.jboss.threads.JBossThreadFactory">
- <constructor>
- <parameter><inject bean="ThreadGroup"/></parameter>
- <parameter>false</parameter>
- <parameter>5</parameter>
- <parameter>work</parameter>
- <parameter><null/></parameter>
- <parameter><null/></parameter>
- </constructor>
- </bean>
-
- <!-- Short running thread pool -->
- <bean name="ShortRunningThreadPool">
- <constructor factoryMethod="threadFactoryExecutor"
- factoryClass="org.jboss.threads.JBossExecutors">
- <parameter><inject bean="ThreadFactory"/></parameter>
- </constructor>
- </bean>
-
- <!-- Long running thread pool -->
- <bean name="LongRunningThreadPool">
- <constructor factoryMethod="threadFactoryExecutor"
- factoryClass="org.jboss.threads.JBossExecutors">
- <parameter><inject bean="ThreadFactory"/></parameter>
- </constructor>
- </bean>
-
- <!-- Work Manager -->
- <bean name="WorkManager"
- interface="org.jboss.jca.core.api.WorkManager"
- class="org.jboss.jca.core.workmanager.WorkManagerImpl">
-
- <!-- The short running thread pool -->
- <property name="ShortRunningThreadPool"><inject bean="ShortRunningThreadPool"/></property>
-
- <!-- The long running thread pool -->
- <property name="LongRunningThreadPool"><inject bean="LongRunningThreadPool"/></property>
-
- <!-- The XA terminator -->
- <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
- </bean>
-
-</deployment>
Copied: projects/jboss-jca/trunk/core/src/test/resources/workmanager.xml (from rev 109543, projects/jboss-jca/trunk/core/src/test/resources/workmanager-jboss-beans.xml)
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/workmanager.xml (rev 0)
+++ projects/jboss-jca/trunk/core/src/test/resources/workmanager.xml 2010-11-30 14:19:06 UTC (rev 109556)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment>
+
+ <!-- Thread group -->
+ <bean name="ThreadGroup"
+ class="java.lang.ThreadGroup">
+ <constructor>
+ <parameter>workmanager</parameter>
+ </constructor>
+ <ignoreStop/>
+ <ignoreDestroy/>
+ </bean>
+
+ <!-- Thread factory -->
+ <bean name="ThreadFactory"
+ interface="java.util.concurrent.ThreadFactory"
+ class="org.jboss.threads.JBossThreadFactory">
+ <constructor>
+ <parameter><inject bean="ThreadGroup"/></parameter>
+ <parameter>false</parameter>
+ <parameter>5</parameter>
+ <parameter>work</parameter>
+ <parameter><null/></parameter>
+ <parameter><null/></parameter>
+ </constructor>
+ </bean>
+
+ <!-- Short running thread pool -->
+ <bean name="ShortRunningThreadPool">
+ <constructor factoryMethod="threadFactoryExecutor"
+ factoryClass="org.jboss.threads.JBossExecutors">
+ <parameter><inject bean="ThreadFactory"/></parameter>
+ </constructor>
+ </bean>
+
+ <!-- Long running thread pool -->
+ <bean name="LongRunningThreadPool">
+ <constructor factoryMethod="threadFactoryExecutor"
+ factoryClass="org.jboss.threads.JBossExecutors">
+ <parameter><inject bean="ThreadFactory"/></parameter>
+ </constructor>
+ </bean>
+
+ <!-- Work Manager -->
+ <bean name="WorkManager"
+ interface="org.jboss.jca.core.api.WorkManager"
+ class="org.jboss.jca.core.workmanager.WorkManagerImpl">
+
+ <!-- The short running thread pool -->
+ <property name="ShortRunningThreadPool"><inject bean="ShortRunningThreadPool"/></property>
+
+ <!-- The long running thread pool -->
+ <property name="LongRunningThreadPool"><inject bean="LongRunningThreadPool"/></property>
+
+ <!-- The XA terminator -->
+ <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
+ </bean>
+
+</deployment>
More information about the jboss-cvs-commits
mailing list