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

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Oct 29 06:39:36 EDT 2010 

Author: jesper.pedersen
Date: 2010-10-29 06:39:36 -0400 (Fri, 29 Oct 2010)
New Revision: 108984

Modified:
   projects/jboss-jca/trunk/build.xml
   projects/jboss-jca/trunk/core/src/test/resources/transaction-jboss-beans.xml
   projects/jboss-jca/trunk/embedded/src/main/resources/transaction.xml
   projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/transaction.xml
Log:
[JBJCA-463] JBossTS 4.13.1.GA

Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml	2010-10-29 10:32:13 UTC (rev 108983)
+++ projects/jboss-jca/trunk/build.xml	2010-10-29 10:39:36 UTC (rev 108984)
@@ -112,7 +112,7 @@
   <property name="version.jboss.slf4j.logmanager" value="1.0.0.CR3"/>
   <property name="version.jboss.stdio" value="1.0.0.CR3"/>
   <property name="version.jboss.threads" value="2.0.0.CR5"/>
-  <property name="version.jboss.ts" value="4.11.0.Final"/>
+  <property name="version.jboss.ts" value="4.13.1.Final"/>
   <property name="version.jdepend" value="2.9.1"/>
   <property name="version.jetty" value="7.1.5.v20100705"/>
   <property name="version.jetty.servlet" value="6.1.14"/>

Modified: projects/jboss-jca/trunk/core/src/test/resources/transaction-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/transaction-jboss-beans.xml	2010-10-29 10:32:13 UTC (rev 108983)
+++ projects/jboss-jca/trunk/core/src/test/resources/transaction-jboss-beans.xml	2010-10-29 10:39:36 UTC (rev 108984)
@@ -2,11 +2,6 @@
 
 <deployment>
 
-  <bean name="LoggingEnvironmentBean" class="com.arjuna.common.internal.util.logging.LoggingEnvironmentBean">
-    <constructor factoryClass="com.arjuna.common.internal.util.logging.commonPropertyManager" factoryMethod="getLoggingEnvironmentBean"/>        
-    <property name="loggingFactory">com.arjuna.common.internal.util.logging.jakarta.JakartaRelevelingLogFactory;com.arjuna.common.internal.util.logging.jakarta.Log4JLogger</property>
-  </bean>
-
   <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>
@@ -43,16 +38,42 @@
     <property name="defaultTimeout">300</property>
   </bean>
 
-  <bean name="ObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
-    <constructor factoryClass="com.arjuna.ats.arjuna.common.arjPropertyManager" factoryMethod="getObjectStoreEnvironmentBean"/>
+  <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="ObjectStoreBrowserBean" class="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBean">
-    <constructor factoryClass="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBean" factoryMethod="getObjectStoreBrowserBean"/>
-    <depends>ObjectStoreEnvironmentBean</depends>
+  <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>
@@ -73,8 +94,10 @@
   </bean>
 
   <bean name="RecoveryManager" class="com.arjuna.ats.jbossatx.jta.RecoveryManagerService">
-    <depends>LoggingEnvironmentBean</depends>
     <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"/>
@@ -84,17 +107,18 @@
   <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>LoggingEnvironmentBean</depends>
     <depends>RecoveryEnvironmentBean</depends>
     <depends>CoreEnvironmentBean</depends>
     <depends>CoordinatorEnvironmentBean</depends>
-    <depends>ObjectStoreEnvironmentBean</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">
@@ -184,4 +208,20 @@
     <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>

Modified: projects/jboss-jca/trunk/embedded/src/main/resources/transaction.xml
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/resources/transaction.xml	2010-10-29 10:32:13 UTC (rev 108983)
+++ projects/jboss-jca/trunk/embedded/src/main/resources/transaction.xml	2010-10-29 10:39:36 UTC (rev 108984)
@@ -2,11 +2,6 @@
 
 <deployment>
 
-  <bean name="LoggingEnvironmentBean" class="com.arjuna.common.internal.util.logging.LoggingEnvironmentBean">
-    <constructor factoryClass="com.arjuna.common.internal.util.logging.commonPropertyManager" factoryMethod="getLoggingEnvironmentBean"/>        
-    <property name="loggingFactory">com.arjuna.common.internal.util.logging.jakarta.JakartaRelevelingLogFactory;com.arjuna.common.internal.util.logging.jakarta.Log4JLogger</property>
-  </bean>
-
   <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>
@@ -43,16 +38,42 @@
     <property name="defaultTimeout">300</property>
   </bean>
 
-  <bean name="ObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
-    <constructor factoryClass="com.arjuna.ats.arjuna.common.arjPropertyManager" factoryMethod="getObjectStoreEnvironmentBean"/>
+  <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="ObjectStoreBrowserBean" class="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBean">
-    <constructor factoryClass="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBean" factoryMethod="getObjectStoreBrowserBean"/>
-    <depends>ObjectStoreEnvironmentBean</depends>
+  <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>
@@ -73,8 +94,10 @@
   </bean>
 
   <bean name="RecoveryManager" class="com.arjuna.ats.jbossatx.jta.RecoveryManagerService">
-    <depends>LoggingEnvironmentBean</depends>
     <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"/>
@@ -84,17 +107,18 @@
   <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>LoggingEnvironmentBean</depends>
     <depends>RecoveryEnvironmentBean</depends>
     <depends>CoreEnvironmentBean</depends>
     <depends>CoordinatorEnvironmentBean</depends>
-    <depends>ObjectStoreEnvironmentBean</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">
@@ -183,7 +207,7 @@
     <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>
@@ -199,5 +223,5 @@
 
     <depends>NamingServer</depends>
   </bean>
-
+  
 </deployment>

Modified: projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/transaction.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/transaction.xml	2010-10-29 10:32:13 UTC (rev 108983)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/transaction.xml	2010-10-29 10:39:36 UTC (rev 108984)
@@ -2,11 +2,6 @@
 
 <deployment>
 
-  <bean name="LoggingEnvironmentBean" class="com.arjuna.common.internal.util.logging.LoggingEnvironmentBean">
-    <constructor factoryClass="com.arjuna.common.internal.util.logging.commonPropertyManager" factoryMethod="getLoggingEnvironmentBean"/>        
-    <property name="loggingFactory">com.arjuna.common.internal.util.logging.jakarta.JakartaRelevelingLogFactory;com.arjuna.common.internal.util.logging.jakarta.Log4JLogger</property>
-  </bean>
-
   <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>
@@ -43,16 +38,42 @@
     <property name="defaultTimeout">300</property>
   </bean>
 
-  <bean name="ObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
-    <constructor factoryClass="com.arjuna.ats.arjuna.common.arjPropertyManager" factoryMethod="getObjectStoreEnvironmentBean"/>
+  <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="ObjectStoreBrowserBean" class="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBean">
-    <constructor factoryClass="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBean" factoryMethod="getObjectStoreBrowserBean"/>
-    <depends>ObjectStoreEnvironmentBean</depends>
+  <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>
@@ -73,8 +94,10 @@
   </bean>
 
   <bean name="RecoveryManager" class="com.arjuna.ats.jbossatx.jta.RecoveryManagerService">
-    <depends>LoggingEnvironmentBean</depends>
     <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"/>
@@ -84,17 +107,18 @@
   <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>LoggingEnvironmentBean</depends>
     <depends>RecoveryEnvironmentBean</depends>
     <depends>CoreEnvironmentBean</depends>
     <depends>CoordinatorEnvironmentBean</depends>
-    <depends>ObjectStoreEnvironmentBean</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">

More information about the jboss-cvs-commits mailing list