[jboss-cvs] JBossAS SVN: r100919 - in projects/jboss-jca/trunk: core/src/main/resources and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2010-02-12 11:21:30 -0500 (Fri, 12 Feb 2010)
New Revision: 100919

Added:
   projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/jca.xml
Removed:
   projects/jboss-jca/trunk/core/src/main/resources/deployment/
Modified:
   projects/jboss-jca/trunk/core/build.xml
   projects/jboss-jca/trunk/standalone/build.xml
   projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/transaction.xml
Log:
Keep the container configuration separate

Modified: projects/jboss-jca/trunk/core/build.xml
===================================================================
--- projects/jboss-jca/trunk/core/build.xml	2010-02-12 16:07:41 UTC (rev 100918)
+++ projects/jboss-jca/trunk/core/build.xml	2010-02-12 16:21:30 UTC (rev 100919)
@@ -58,14 +58,6 @@
          manifest="src/main/resources/impl-manifest.mf"
          basedir="${build.core.dir}/impl"
          excludes="**/*.java, **/core/api/**"/>
-
-    <mkdir dir="${target.dir}/bootstrap"/>
-    <copy todir="${target.dir}/bootstrap">
-      <fileset dir="src/main/resources/deployment">
-        <include name="**/*.xml"/>
-      </fileset>
-    </copy>
-
   </target>
 
   <!-- ================================= 

Modified: projects/jboss-jca/trunk/standalone/build.xml
===================================================================
--- projects/jboss-jca/trunk/standalone/build.xml	2010-02-12 16:07:41 UTC (rev 100918)
+++ projects/jboss-jca/trunk/standalone/build.xml	2010-02-12 16:21:30 UTC (rev 100919)
@@ -119,12 +119,6 @@
       </fileset>
     </copy>
 
-    <copy todir="${target.dir}/standalone/server/jca/conf/bootstrap">
-      <fileset dir="${target.dir}/bootstrap">
-        <include name="**/*.xml"/>
-      </fileset>
-    </copy>
-
     <copy todir="${target.dir}/standalone/server/jca/conf">
       <fileset dir="src/main/resources/">
         <include name="*.properties"/>

Added: projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/jca.xml
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/jca.xml	                        (rev 0)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/jca.xml	2010-02-12 16:21:30 UTC (rev 100919)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    JBoss JCA
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+  <!-- Thread group -->
+  <bean name="ThreadGroup"
+        class="java.lang.ThreadGroup">
+    <constructor>
+      <parameter>workmanager</parameter>
+    </constructor>
+  </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>
+
+  <!-- Default Bootstrap context -->
+  <bean name="DefaultBootstrapContext" 
+        interface="org.jboss.jca.core.api.CloneableBootstrapContext"
+        class="org.jboss.jca.core.bootstrapcontext.BaseCloneableBootstrapContext">
+
+    <!-- The Transaction Synchronization Registry -->
+    <property name="transactionSynchronizationRegistry"><inject bean="TransactionSynchronizationRegistry"/></property>
+
+    <!-- The Work Manager -->
+    <property name="workManager"><inject bean="WorkManager"/></property>
+
+    <!-- The XA terminator -->
+    <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
+  </bean>
+  
+</deployment>

Modified: projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/transaction.xml
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/transaction.xml	2010-02-12 16:07:41 UTC (rev 100918)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/transaction.xml	2010-02-12 16:21:30 UTC (rev 100919)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<deployment>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
 
   <bean name="LoggingEnvironmentBean" class="com.arjuna.common.internal.util.logging.LoggingEnvironmentBean">
     <constructor factoryClass="com.arjuna.common.internal.util.logging.commonPropertyManager" factoryMethod="getLoggingEnvironmentBean"/>