[jboss-cvs] JBossAS SVN: r87945 - in projects/jboss-jca/trunk/core/src/test: java/org/jboss/jca/test/core/spec/chapter10/section1 and 7 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Apr 28 09:54:28 EDT 2009


Author: jesper.pedersen
Date: 2009-04-28 09:54:28 -0400 (Tue, 28 Apr 2009)
New Revision: 87945

Added:
   projects/jboss-jca/trunk/core/src/test/resources/workmanager-jboss-beans.xml
Removed:
   projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/api/WorkAdapterTestCase-jboss-beans.xml
   projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/api/WorkListenerTestCase-jboss-beans.xml
   projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerDoWorkTestCase-jboss-beans.xml
   projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerScheduleWorkTestCase-jboss-beans.xml
   projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerStartWorkTestCase-jboss-beans.xml
   projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/api/WorkTestCase-jboss-beans.xml
   projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section1/ManageThreadTestCase-jboss-beans.xml
   projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkInterfaceTestCase-jboss-beans.xml
   projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkListenerInterfaceTestCase-jboss-beans.xml
   projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/workmanager/unit/WorkManagerTestCase-jboss-beans.xml
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/WorkListenerTestCase.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerDoWorkTestCase.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerScheduleWorkTestCase.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerStartWorkTestCase.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkTestCase.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section1/ManageThreadTestCase.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkInterfaceTestCase.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkListenerInterfaceTestCase.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagementModelTestCase.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/workmanager/unit/WorkManagerTestCase.java
   projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagementModelTestCase-jboss-beans.xml
   projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase-jboss-beans.xml
Log:
Test cleanups

Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkAdapterTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkAdapterTestCase.java	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkAdapterTestCase.java	2009-04-28 13:54:28 UTC (rev 87945)
@@ -172,12 +172,10 @@
       // Create and set a new MC Bootstrap
       bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
 
-      // Deploy Naming and Transaction
+      // Deploy Naming, Transaction and WorkManager
       bootstrap.deploy(WorkAdapterTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
       bootstrap.deploy(WorkAdapterTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
-      
-      // Deploy Beans
-      bootstrap.deploy(WorkAdapterTestCase.class);
+      bootstrap.deploy(WorkAdapterTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
    }
 
    /**
@@ -187,13 +185,11 @@
    @AfterClass
    public static void afterClass() throws Throwable
    {
-      // Undeploy Transaction and Naming
+      // Undeploy WorkManager, Transaction and Naming
+      bootstrap.undeploy(WorkAdapterTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
       bootstrap.undeploy(WorkAdapterTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
       bootstrap.undeploy(WorkAdapterTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
 
-      // Undeploy Beans
-      bootstrap.undeploy(WorkAdapterTestCase.class);
-
       // Shutdown MC
       bootstrap.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	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkListenerTestCase.java	2009-04-28 13:54:28 UTC (rev 87945)
@@ -172,12 +172,10 @@
       // Create and set a new MC Bootstrap
       bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
 
-      // Deploy Naming and Transaction
+      // Deploy Naming, Transaction and WorkManager
       bootstrap.deploy(WorkListenerTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
       bootstrap.deploy(WorkListenerTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
-      
-      // Deploy Beans
-      bootstrap.deploy(WorkListenerTestCase.class);
+      bootstrap.deploy(WorkListenerTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
    }
 
    /**
@@ -187,13 +185,11 @@
    @AfterClass
    public static void afterClass() throws Throwable
    {
-      // Undeploy Transaction and Naming
+      // Undeploy WorkManager, Transaction and Naming
+      bootstrap.undeploy(WorkListenerTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
       bootstrap.undeploy(WorkListenerTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
       bootstrap.undeploy(WorkListenerTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
 
-      // Undeploy Beans
-      bootstrap.undeploy(WorkListenerTestCase.class);
-
       // Shutdown MC
       bootstrap.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	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerDoWorkTestCase.java	2009-04-28 13:54:28 UTC (rev 87945)
@@ -30,7 +30,6 @@
 
 import java.util.concurrent.CountDownLatch;
 
-import javax.resource.spi.BootstrapContext;
 import javax.resource.spi.work.ExecutionContext;
 import javax.resource.spi.work.Work;
 import javax.resource.spi.work.WorkException;
@@ -328,12 +327,10 @@
       // Create and set a new MC Bootstrap
       bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
 
-      // Deploy Naming and Transaction
+      // Deploy Naming, Transaction and WorkManager
       bootstrap.deploy(WorkManagerDoWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
       bootstrap.deploy(WorkManagerDoWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
-      
-      // Deploy Beans
-      bootstrap.deploy(WorkManagerDoWorkTestCase.class);
+      bootstrap.deploy(WorkManagerDoWorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
    }
 
    /**
@@ -343,13 +340,11 @@
    @AfterClass
    public static void afterClass() throws Throwable
    {
-      // Undeploy Transaction and Naming
+      // Undeploy WorkManager, Transaction and Naming
+      bootstrap.undeploy(WorkManagerDoWorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
       bootstrap.undeploy(WorkManagerDoWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
       bootstrap.undeploy(WorkManagerDoWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
 
-      // Undeploy Beans
-      bootstrap.undeploy(WorkManagerDoWorkTestCase.class);
-
       // Shutdown MC
       bootstrap.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	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerScheduleWorkTestCase.java	2009-04-28 13:54:28 UTC (rev 87945)
@@ -31,7 +31,6 @@
 
 import java.util.concurrent.CountDownLatch;
 
-import javax.resource.spi.BootstrapContext;
 import javax.resource.spi.work.ExecutionContext;
 import javax.resource.spi.work.Work;
 import javax.resource.spi.work.WorkException;
@@ -406,12 +405,10 @@
       // Create and set a new MC Bootstrap
       bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
 
-      // Deploy Naming and Transaction
+      // Deploy Naming, Transaction and WorkManager
       bootstrap.deploy(WorkManagerScheduleWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
       bootstrap.deploy(WorkManagerScheduleWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
-      
-      // Deploy Beans
-      bootstrap.deploy(WorkManagerScheduleWorkTestCase.class);
+      bootstrap.deploy(WorkManagerScheduleWorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
    }
 
    /**
@@ -421,13 +418,11 @@
    @AfterClass
    public static void afterClass() throws Throwable
    {
-      // Undeploy Transaction and Naming
+      // Undeploy WorkManager, Transaction and Naming
+      bootstrap.undeploy(WorkManagerScheduleWorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
       bootstrap.undeploy(WorkManagerScheduleWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
       bootstrap.undeploy(WorkManagerScheduleWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
 
-      // Undeploy Beans
-      bootstrap.undeploy(WorkManagerScheduleWorkTestCase.class);
-
       // Shutdown MC
       bootstrap.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	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerStartWorkTestCase.java	2009-04-28 13:54:28 UTC (rev 87945)
@@ -27,7 +27,6 @@
 
 import java.util.concurrent.CountDownLatch;
 
-import javax.resource.spi.BootstrapContext;
 import javax.resource.spi.work.ExecutionContext;
 import javax.resource.spi.work.Work;
 import javax.resource.spi.work.WorkException;
@@ -424,12 +423,10 @@
       // Create and set a new MC Bootstrap
       bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
 
-      // Deploy Naming and Transaction
+      // Deploy Naming, Transaction and WorkManager
       bootstrap.deploy(WorkManagerStartWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
       bootstrap.deploy(WorkManagerStartWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
-      
-      // Deploy Beans
-      bootstrap.deploy(WorkManagerStartWorkTestCase.class);
+      bootstrap.deploy(WorkManagerStartWorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
    }
 
    /**
@@ -439,13 +436,11 @@
    @AfterClass
    public static void afterClass() throws Throwable
    {
-      // Undeploy Transaction and Naming
+      // Undeploy WorkManager, Transaction and Naming
+      bootstrap.undeploy(WorkManagerStartWorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
       bootstrap.undeploy(WorkManagerStartWorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
       bootstrap.undeploy(WorkManagerStartWorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
 
-      // Undeploy Beans
-      bootstrap.undeploy(WorkManagerStartWorkTestCase.class);
-
       // Shutdown MC
       bootstrap.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	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/api/WorkTestCase.java	2009-04-28 13:54:28 UTC (rev 87945)
@@ -107,12 +107,10 @@
       // Create and set a new MC Bootstrap
       bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
 
-      // Deploy Naming and Transaction
+      // Deploy Naming, Transaction and WorkManager
       bootstrap.deploy(WorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
       bootstrap.deploy(WorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
-      
-      // Deploy Beans
-      bootstrap.deploy(WorkTestCase.class);
+      bootstrap.deploy(WorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
    }
 
    /**
@@ -122,13 +120,11 @@
    @AfterClass
    public static void afterClass() throws Throwable
    {
-      // Undeploy Transaction and Naming
+      // Undeploy WorkManager, Transaction and Naming
+      bootstrap.undeploy(WorkTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
       bootstrap.undeploy(WorkTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
       bootstrap.undeploy(WorkTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
 
-      // Undeploy Beans
-      bootstrap.undeploy(WorkTestCase.class);
-
       // Shutdown MC
       bootstrap.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	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section1/ManageThreadTestCase.java	2009-04-28 13:54:28 UTC (rev 87945)
@@ -108,12 +108,10 @@
       // Create and set a new MC Bootstrap
       bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
 
-      // Deploy Naming and Transaction
+      // Deploy Naming, Transaction and WorkManager
       bootstrap.deploy(ManageThreadTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
       bootstrap.deploy(ManageThreadTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
-      
-      // Deploy Beans
-      bootstrap.deploy(ManageThreadTestCase.class);
+      bootstrap.deploy(ManageThreadTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
    }
 
    /**
@@ -123,13 +121,11 @@
    @AfterClass
    public static void afterClass() throws Throwable
    {
-      // Undeploy Transaction and Naming
+      // Undeploy WorkManager, Transaction and Naming
+      bootstrap.undeploy(ManageThreadTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
       bootstrap.undeploy(ManageThreadTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
       bootstrap.undeploy(ManageThreadTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
 
-      // Undeploy Beans
-      bootstrap.undeploy(ManageThreadTestCase.class);
-
       // Shutdown MC
       bootstrap.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	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkInterfaceTestCase.java	2009-04-28 13:54:28 UTC (rev 87945)
@@ -210,12 +210,10 @@
       // Create and set a new MC Bootstrap
       bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
 
-      // Deploy Naming and Transaction
+      // Deploy Naming, Transaction and WorkManager
       bootstrap.deploy(WorkInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
       bootstrap.deploy(WorkInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
-      
-      // Deploy Beans
-      bootstrap.deploy(WorkInterfaceTestCase.class);
+      bootstrap.deploy(WorkInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
    }
 
    /**
@@ -225,13 +223,11 @@
    @AfterClass
    public static void afterClass() throws Throwable
    {
-      // Undeploy Transaction and Naming
+      // Undeploy WorkManager, Transaction and Naming
+      bootstrap.undeploy(WorkInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
       bootstrap.undeploy(WorkInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
       bootstrap.undeploy(WorkInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
 
-      // Undeploy Beans
-      bootstrap.undeploy(WorkInterfaceTestCase.class);
-
       // Shutdown MC
       bootstrap.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	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkListenerInterfaceTestCase.java	2009-04-28 13:54:28 UTC (rev 87945)
@@ -299,12 +299,10 @@
       // Create and set a new MC Bootstrap
       bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
 
-      // Deploy Naming and Transaction
+      // Deploy Naming, Transaction and WorkManager
       bootstrap.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
       bootstrap.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
-      
-      // Deploy Beans
-      bootstrap.deploy(WorkManagerInterfaceTestCase.class);
+      bootstrap.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
    }
 
    /**
@@ -314,13 +312,11 @@
    @AfterClass
    public static void afterClass() throws Throwable
    {
-      // Undeploy Transaction and Naming
+      // Undeploy WorkManager, Transaction and Naming
+      bootstrap.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
       bootstrap.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
       bootstrap.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
 
-      // Undeploy Beans
-      bootstrap.undeploy(WorkManagerInterfaceTestCase.class);
-
       // Shutdown MC
       bootstrap.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	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagementModelTestCase.java	2009-04-28 13:54:28 UTC (rev 87945)
@@ -286,9 +286,10 @@
       // Create and set a new MC Bootstrap
       bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
 
-      // Deploy Naming and Transaction
+      // Deploy Naming, Transaction and WorkManager
       bootstrap.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
       bootstrap.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+      bootstrap.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
       
       // Deploy Beans
       bootstrap.deploy(WorkManagerInterfaceTestCase.class);
@@ -301,7 +302,8 @@
    @AfterClass
    public static void afterClass() throws Throwable
    {
-      // Undeploy Transaction and Naming
+      // Undeploy WorkManager, Transaction and Naming
+      bootstrap.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
       bootstrap.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
       bootstrap.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
 

Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase.java	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase.java	2009-04-28 13:54:28 UTC (rev 87945)
@@ -324,9 +324,10 @@
       // Create and set a new MC Bootstrap
       bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
 
-      // Deploy Naming and Transaction
+      // Deploy Naming, Transaction and WorkManager
       bootstrap.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
       bootstrap.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
+      bootstrap.deploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
       
       // Deploy Beans
       bootstrap.deploy(WorkManagerInterfaceTestCase.class);
@@ -339,7 +340,8 @@
    @AfterClass
    public static void afterClass() throws Throwable
    {
-      // Undeploy Transaction and Naming
+      // Undeploy WorkManager, Transaction and Naming
+      bootstrap.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
       bootstrap.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
       bootstrap.undeploy(WorkManagerInterfaceTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
 

Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/workmanager/unit/WorkManagerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/workmanager/unit/WorkManagerTestCase.java	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/workmanager/unit/WorkManagerTestCase.java	2009-04-28 13:54:28 UTC (rev 87945)
@@ -114,12 +114,10 @@
       // Create and set a new MC Bootstrap
       bootstrap = EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap();
 
-      // Deploy Naming and Transaction
+      // Deploy Naming, Transaction and WorkManager
       bootstrap.deploy(WorkManagerTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
       bootstrap.deploy(WorkManagerTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
-      
-      // Deploy Beans
-      bootstrap.deploy(WorkManagerTestCase.class);
+      bootstrap.deploy(WorkManagerTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
    }
 
    /**
@@ -129,13 +127,11 @@
    @AfterClass
    public static void afterClass() throws Throwable
    {
-      // Undeploy Transaction and Naming
+      // Undeploy WorkManager, Transaction and Naming
+      bootstrap.undeploy(WorkManagerTestCase.class.getClassLoader(), "workmanager-jboss-beans.xml");
       bootstrap.undeploy(WorkManagerTestCase.class.getClassLoader(), "transaction-jboss-beans.xml");
       bootstrap.undeploy(WorkManagerTestCase.class.getClassLoader(), "naming-jboss-beans.xml");
 
-      // Undeploy Beans
-      bootstrap.undeploy(WorkManagerTestCase.class);
-
       // Shutdown MC
       bootstrap.shutdown();
 

Deleted: projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/api/WorkAdapterTestCase-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/api/WorkAdapterTestCase-jboss-beans.xml	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/api/WorkAdapterTestCase-jboss-beans.xml	2009-04-28 13:54:28 UTC (rev 87945)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    JBoss JCA
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-  <bean name="WorkManagerThreadPool" interface="org.jboss.jca.common.api.ThreadPool" class="org.jboss.jca.common.threadpool.ThreadPoolImpl">
-    <!-- The name that appears in thread names -->
-    <property name="name">WorkManager</property>
-
-    <!-- The maximum amount of work in the queue -->
-    <property name="maximumQueueSize">1024</property>
-    
-    <!-- The maximum number of active threads -->
-    <property name="maximumPoolSize">100</property>
-    
-    <!-- How long to keep threads alive after their last work (default one minute) -->
-    <property name="keepAliveTime">60000</property>
-  </bean>
-
-  <bean name="WorkManager" interface="org.jboss.jca.core.api.WorkManager" class="org.jboss.jca.core.workmanager.WorkManagerImpl">
-    <!-- The thread pool -->
-    <property name="threadPool"><inject bean="WorkManagerThreadPool"/></property>
-
-    <!-- The XA terminator -->
-    <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
-  </bean>
-  
-  <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/org/jboss/jca/test/core/spec/chapter10/api/WorkListenerTestCase-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/api/WorkListenerTestCase-jboss-beans.xml	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/api/WorkListenerTestCase-jboss-beans.xml	2009-04-28 13:54:28 UTC (rev 87945)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    JBoss JCA
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-  <bean name="WorkManagerThreadPool" interface="org.jboss.jca.common.api.ThreadPool" class="org.jboss.jca.common.threadpool.ThreadPoolImpl">
-    <!-- The name that appears in thread names -->
-    <property name="name">WorkManager</property>
-
-    <!-- The maximum amount of work in the queue -->
-    <property name="maximumQueueSize">1024</property>
-    
-    <!-- The maximum number of active threads -->
-    <property name="maximumPoolSize">100</property>
-    
-    <!-- How long to keep threads alive after their last work (default one minute) -->
-    <property name="keepAliveTime">60000</property>
-  </bean>
-
-  <bean name="WorkManager" interface="org.jboss.jca.core.api.WorkManager" class="org.jboss.jca.core.workmanager.WorkManagerImpl">
-    <!-- The thread pool -->
-    <property name="threadPool"><inject bean="WorkManagerThreadPool"/></property>
-
-    <!-- The XA terminator -->
-    <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
-  </bean>
-  
-  <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/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerDoWorkTestCase-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerDoWorkTestCase-jboss-beans.xml	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerDoWorkTestCase-jboss-beans.xml	2009-04-28 13:54:28 UTC (rev 87945)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    JBoss JCA
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-  <bean name="WorkManagerThreadPool" interface="org.jboss.jca.common.api.ThreadPool" class="org.jboss.jca.common.threadpool.ThreadPoolImpl">
-    <!-- The name that appears in thread names -->
-    <property name="name">WorkManager</property>
-
-    <!-- The maximum amount of work in the queue -->
-    <property name="maximumQueueSize">1024</property>
-    
-    <!-- The maximum number of active threads -->
-    <property name="maximumPoolSize">100</property>
-    
-    <!-- How long to keep threads alive after their last work (default one minute) -->
-    <property name="keepAliveTime">60000</property>
-  </bean>
-
-  <bean name="WorkManager" interface="org.jboss.jca.core.api.WorkManager" class="org.jboss.jca.core.workmanager.WorkManagerImpl">
-    <!-- The thread pool -->
-    <property name="threadPool"><inject bean="WorkManagerThreadPool"/></property>
-
-    <!-- The XA terminator -->
-    <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
-  </bean>
-  
-  <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/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerScheduleWorkTestCase-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerScheduleWorkTestCase-jboss-beans.xml	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerScheduleWorkTestCase-jboss-beans.xml	2009-04-28 13:54:28 UTC (rev 87945)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    JBoss JCA
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-  <bean name="WorkManagerThreadPool" interface="org.jboss.jca.common.api.ThreadPool" class="org.jboss.jca.common.threadpool.ThreadPoolImpl">
-    <!-- The name that appears in thread names -->
-    <property name="name">WorkManager</property>
-
-    <!-- The maximum amount of work in the queue -->
-    <property name="maximumQueueSize">1024</property>
-    
-    <!-- The maximum number of active threads -->
-    <property name="maximumPoolSize">100</property>
-    
-    <!-- How long to keep threads alive after their last work (default one minute) -->
-    <property name="keepAliveTime">60000</property>
-  </bean>
-
-  <bean name="WorkManager" interface="org.jboss.jca.core.api.WorkManager" class="org.jboss.jca.core.workmanager.WorkManagerImpl">
-    <!-- The thread pool -->
-    <property name="threadPool"><inject bean="WorkManagerThreadPool"/></property>
-
-    <!-- The XA terminator -->
-    <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
-  </bean>
-  
-  <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/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerStartWorkTestCase-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerStartWorkTestCase-jboss-beans.xml	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/api/WorkManagerStartWorkTestCase-jboss-beans.xml	2009-04-28 13:54:28 UTC (rev 87945)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    JBoss JCA
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-  <bean name="WorkManagerThreadPool" interface="org.jboss.jca.common.api.ThreadPool" class="org.jboss.jca.common.threadpool.ThreadPoolImpl">
-    <!-- The name that appears in thread names -->
-    <property name="name">WorkManager</property>
-
-    <!-- The maximum amount of work in the queue -->
-    <property name="maximumQueueSize">1024</property>
-    
-    <!-- The maximum number of active threads -->
-    <property name="maximumPoolSize">100</property>
-    
-    <!-- How long to keep threads alive after their last work (default one minute) -->
-    <property name="keepAliveTime">60000</property>
-  </bean>
-
-  <bean name="WorkManager" interface="org.jboss.jca.core.api.WorkManager" class="org.jboss.jca.core.workmanager.WorkManagerImpl">
-    <!-- The thread pool -->
-    <property name="threadPool"><inject bean="WorkManagerThreadPool"/></property>
-
-    <!-- The XA terminator -->
-    <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
-  </bean>
-  
-  <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/org/jboss/jca/test/core/spec/chapter10/api/WorkTestCase-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/api/WorkTestCase-jboss-beans.xml	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/api/WorkTestCase-jboss-beans.xml	2009-04-28 13:54:28 UTC (rev 87945)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    JBoss JCA
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-  <bean name="WorkManagerThreadPool" interface="org.jboss.jca.common.api.ThreadPool" class="org.jboss.jca.common.threadpool.ThreadPoolImpl">
-    <!-- The name that appears in thread names -->
-    <property name="name">WorkManager</property>
-
-    <!-- The maximum amount of work in the queue -->
-    <property name="maximumQueueSize">1024</property>
-    
-    <!-- The maximum number of active threads -->
-    <property name="maximumPoolSize">100</property>
-    
-    <!-- How long to keep threads alive after their last work (default one minute) -->
-    <property name="keepAliveTime">60000</property>
-  </bean>
-
-  <bean name="WorkManager" interface="org.jboss.jca.core.api.WorkManager" class="org.jboss.jca.core.workmanager.WorkManagerImpl">
-    <!-- The thread pool -->
-    <property name="threadPool"><inject bean="WorkManagerThreadPool"/></property>
-
-    <!-- The XA terminator -->
-    <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
-  </bean>
-  
-  <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/org/jboss/jca/test/core/spec/chapter10/section1/ManageThreadTestCase-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section1/ManageThreadTestCase-jboss-beans.xml	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section1/ManageThreadTestCase-jboss-beans.xml	2009-04-28 13:54:28 UTC (rev 87945)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    JBoss JCA
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-  <bean name="WorkManagerThreadPool" interface="org.jboss.jca.common.threadpool.ThreadPool" class="org.jboss.jca.common.threadpool.ThreadPoolImpl">
-    <!-- The name that appears in thread names -->
-    <property name="name">WorkManager</property>
-
-    <!-- The maximum amount of work in the queue -->
-    <property name="maximumQueueSize">1024</property>
-    
-    <!-- The maximum number of active threads -->
-    <property name="maximumPoolSize">100</property>
-    
-    <!-- How long to keep threads alive after their last work (default one minute) -->
-    <property name="keepAliveTime">60000</property>
-  </bean>
-
-  <bean name="WorkManager" interface="org.jboss.jca.core.api.WorkManager" class="org.jboss.jca.core.workmanager.WorkManagerImpl">
-    <!-- The thread pool -->
-    <property name="threadPool"><inject bean="WorkManagerThreadPool"/></property>
-
-    <!-- The XA terminator -->
-    <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
-  </bean>
-  
-</deployment>

Deleted: projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkInterfaceTestCase-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkInterfaceTestCase-jboss-beans.xml	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkInterfaceTestCase-jboss-beans.xml	2009-04-28 13:54:28 UTC (rev 87945)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    JBoss JCA
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-  <bean name="WorkManagerThreadPool" interface="org.jboss.jca.common.threadpool.ThreadPool" class="org.jboss.jca.common.threadpool.ThreadPoolImpl">
-    <!-- The name that appears in thread names -->
-    <property name="name">WorkManager</property>
-
-    <!-- The maximum amount of work in the queue -->
-    <property name="maximumQueueSize">1024</property>
-    
-    <!-- The maximum number of active threads -->
-    <property name="maximumPoolSize">100</property>
-    
-    <!-- How long to keep threads alive after their last work (default one minute) -->
-    <property name="keepAliveTime">60000</property>
-  </bean>
-
-  <bean name="WorkManager" interface="org.jboss.jca.core.api.WorkManager" class="org.jboss.jca.core.workmanager.WorkManagerImpl">
-    <!-- The thread pool -->
-    <property name="threadPool"><inject bean="WorkManagerThreadPool"/></property>
-
-    <!-- The XA terminator -->
-    <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
-  </bean>
-  
-</deployment>

Deleted: projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkListenerInterfaceTestCase-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkListenerInterfaceTestCase-jboss-beans.xml	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkListenerInterfaceTestCase-jboss-beans.xml	2009-04-28 13:54:28 UTC (rev 87945)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    JBoss JCA
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-  <bean name="WorkManagerThreadPool" interface="org.jboss.jca.common.threadpool.ThreadPool" class="org.jboss.jca.common.threadpool.ThreadPoolImpl">
-    <!-- The name that appears in thread names -->
-    <property name="name">WorkManager</property>
-
-    <!-- The maximum amount of work in the queue -->
-    <property name="maximumQueueSize">1024</property>
-    
-    <!-- The maximum number of active threads -->
-    <property name="maximumPoolSize">100</property>
-    
-    <!-- How long to keep threads alive after their last work (default one minute) -->
-    <property name="keepAliveTime">60000</property>
-  </bean>
-
-  <bean name="WorkManager" interface="org.jboss.jca.core.api.WorkManager" class="org.jboss.jca.core.workmanager.WorkManagerImpl">
-    <!-- The thread pool -->
-    <property name="threadPool"><inject bean="WorkManagerThreadPool"/></property>
-
-    <!-- The XA terminator -->
-    <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
-  </bean>
-  
-</deployment>

Modified: projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagementModelTestCase-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagementModelTestCase-jboss-beans.xml	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagementModelTestCase-jboss-beans.xml	2009-04-28 13:54:28 UTC (rev 87945)
@@ -5,28 +5,6 @@
 -->
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-  <bean name="WorkManagerThreadPool" interface="org.jboss.jca.common.threadpool.ThreadPool" class="org.jboss.jca.common.threadpool.ThreadPoolImpl">
-    <!-- The name that appears in thread names -->
-    <property name="name">WorkManager</property>
-
-    <!-- The maximum amount of work in the queue -->
-    <property name="maximumQueueSize">1024</property>
-    
-    <!-- The maximum number of active threads -->
-    <property name="maximumPoolSize">100</property>
-    
-    <!-- How long to keep threads alive after their last work (default one minute) -->
-    <property name="keepAliveTime">60000</property>
-  </bean>
-
-  <bean name="WorkManager" interface="org.jboss.jca.core.api.WorkManager" class="org.jboss.jca.core.workmanager.WorkManagerImpl">
-    <!-- The thread pool -->
-    <property name="threadPool"><inject bean="WorkManagerThreadPool"/></property>
-
-    <!-- The XA terminator -->
-    <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
-  </bean>
-  
   <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>

Modified: projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase-jboss-beans.xml	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase-jboss-beans.xml	2009-04-28 13:54:28 UTC (rev 87945)
@@ -5,28 +5,6 @@
 -->
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-  <bean name="WorkManagerThreadPool" interface="org.jboss.jca.common.api.ThreadPool" class="org.jboss.jca.common.threadpool.ThreadPoolImpl">
-    <!-- The name that appears in thread names -->
-    <property name="name">WorkManager</property>
-
-    <!-- The maximum amount of work in the queue -->
-    <property name="maximumQueueSize">1024</property>
-    
-    <!-- The maximum number of active threads -->
-    <property name="maximumPoolSize">100</property>
-    
-    <!-- How long to keep threads alive after their last work (default one minute) -->
-    <property name="keepAliveTime">60000</property>
-  </bean>
-
-  <bean name="WorkManager" interface="org.jboss.jca.core.api.WorkManager" class="org.jboss.jca.core.workmanager.WorkManagerImpl">
-    <!-- The thread pool -->
-    <property name="threadPool"><inject bean="WorkManagerThreadPool"/></property>
-
-    <!-- The XA terminator -->
-    <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
-  </bean>
-  
   <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>

Deleted: projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/workmanager/unit/WorkManagerTestCase-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/workmanager/unit/WorkManagerTestCase-jboss-beans.xml	2009-04-28 13:21:06 UTC (rev 87944)
+++ projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/workmanager/unit/WorkManagerTestCase-jboss-beans.xml	2009-04-28 13:54:28 UTC (rev 87945)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    JBoss JCA
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-  <bean name="WorkManagerThreadPool" interface="org.jboss.jca.common.threadpool.ThreadPool" class="org.jboss.jca.common.threadpool.ThreadPoolImpl">
-    <!-- The name that appears in thread names -->
-    <property name="name">WorkManager</property>
-
-    <!-- The maximum amount of work in the queue -->
-    <property name="maximumQueueSize">1024</property>
-    
-    <!-- The maximum number of active threads -->
-    <property name="maximumPoolSize">100</property>
-    
-    <!-- How long to keep threads alive after their last work (default one minute) -->
-    <property name="keepAliveTime">60000</property>
-  </bean>
-
-  <bean name="WorkManager" interface="org.jboss.jca.core.api.WorkManager" class="org.jboss.jca.core.workmanager.WorkManagerImpl">
-    <!-- The thread pool -->
-    <property name="threadPool"><inject bean="WorkManagerThreadPool"/></property>
-
-    <!-- The XA terminator -->
-    <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
-  </bean>
-  
-</deployment>

Added: projects/jboss-jca/trunk/core/src/test/resources/workmanager-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/workmanager-jboss-beans.xml	                        (rev 0)
+++ projects/jboss-jca/trunk/core/src/test/resources/workmanager-jboss-beans.xml	2009-04-28 13:54:28 UTC (rev 87945)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    JBoss JCA
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+  <bean name="WorkManagerThreadPool" interface="org.jboss.jca.common.api.ThreadPool" class="org.jboss.jca.common.threadpool.ThreadPoolImpl">
+    <!-- The name that appears in thread names -->
+    <property name="name">WorkManager</property>
+
+    <!-- The maximum amount of work in the queue -->
+    <property name="maximumQueueSize">1024</property>
+    
+    <!-- The maximum number of active threads -->
+    <property name="maximumPoolSize">100</property>
+    
+    <!-- How long to keep threads alive after their last work (default one minute) -->
+    <property name="keepAliveTime">60000</property>
+  </bean>
+
+  <bean name="WorkManager" interface="org.jboss.jca.core.api.WorkManager" class="org.jboss.jca.core.workmanager.WorkManagerImpl">
+    <!-- The thread pool -->
+    <property name="threadPool"><inject bean="WorkManagerThreadPool"/></property>
+
+    <!-- The XA terminator -->
+    <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
+  </bean>
+
+</deployment>




More information about the jboss-cvs-commits mailing list