[jboss-svn-commits] JBL Code SVN: r35428 - labs/jbosstm/trunk/atsintegration.

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

Author: jhalliday
Date: 2010-10-05 08:18:37 -0400 (Tue, 05 Oct 2010)
New Revision: 35428

Modified:
   labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml
   labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml.jts
Log:
Update AS integration xml examples for 4.13 JBTM-793


Modified: labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml
===================================================================
--- labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml	2010-10-05 12:08:07 UTC (rev 35427)
+++ labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml	2010-10-05 12:18:37 UTC (rev 35428)
@@ -2,8 +2,8 @@
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
     <!--
-        This is an example transaction-jboss-beans.xml file suitable for installing JBossTS 4.12 JTA
-        into AS 6.0.M4. The canonical version of this file normally resides in the JBossAS svn
+        This is an example transaction-jboss-beans.xml file suitable for installing JBossTS 4.13 JTA
+        into AS 6.0.M5. The canonical version of this file normally resides in the JBossAS svn
         but right now JBossAS is running an earlier TS release, so we provide this file via the
         JBossTS svn as an example to facilitate upgrading. Take care - some non-arjuna beans many have
         changed in the AS svn since we forked this file, so you may need to merge rather than overwrite.
@@ -11,7 +11,7 @@
         You need a different version of this file for JTS mode.
         You don't need a jbossts-properties.xml in the AS anymore, it's all done by the beans below.
 
-         jonathan.halliday at redhat.com, 2009-09
+         jonathan.halliday at redhat.com, 2010-10
     -->
 
     <bean name="RecoveryEnvironmentBean" class="com.arjuna.ats.arjuna.common.RecoveryEnvironmentBean">
@@ -110,6 +110,9 @@
     </bean>
 
     <bean name="ObjectStoreBrowserBean" class="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBrowser">
+
+        <demand state="Create">ObjectStoreEnvironmentBean</demand>
+        
         <property name="types" preinstantiate="false">
             <map keyClass="java.lang.String" valueClass="java.lang.String">
                 <entry>

Modified: labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml.jts
===================================================================
--- labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml.jts	2010-10-05 12:08:07 UTC (rev 35427)
+++ labs/jbosstm/trunk/atsintegration/transaction-jboss-beans.xml.jts	2010-10-05 12:18:37 UTC (rev 35428)
@@ -2,8 +2,8 @@
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
     <!--
-        This is an example transaction-jboss-beans.xml file suitable for installing JBossTS 4.12 JTS
-        into AS 6.0.M4. The canonical version of this file normally resides in the JBossAS svn
+        This is an example transaction-jboss-beans.xml file suitable for installing JBossTS 4.13 JTS
+        into AS 6.0.M5. The canonical version of this file normally resides in the JBossAS svn
         but right now JBossAS is running an earlier TS release, so we provide this file via the
         JBossTS svn as an example to facilitate upgrading. Take care - some non-arjuna beans many have
         changed in the AS svn since we forked this file, so you may need to merge rather than overwrite.
@@ -11,7 +11,7 @@
         You need a different version of this file for JTA mode.
         You don't need a jbossts-properties.xml in the AS anymore, it's all done by the beans below.
 
-         jonathan.halliday at redhat.com, 2009-09
+         jonathan.halliday at redhat.com, 2010-10
     -->
 
     <bean name="RecoveryEnvironmentBean" class="com.arjuna.ats.arjuna.common.RecoveryEnvironmentBean">
@@ -117,6 +117,9 @@
     </bean>
 
     <bean name="ObjectStoreBrowserBean" class="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBrowser">
+
+        <demand state="Create">ObjectStoreEnvironmentBean</demand>
+
         <property name="types" preinstantiate="false">
 			<map keyClass="java.lang.String" valueClass="java.lang.String">
 				<entry>