[jboss-cvs] JBossAS SVN: r107387 - branches/JBPAPP_5_1/build.

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

Author: permaine
Date: 2010-08-04 10:55:19 -0400 (Wed, 04 Aug 2010)
New Revision: 107387

Added:
   branches/JBPAPP_5_1/build/jbossas-5-jbm-xa-recovery.patch
Modified:
   branches/JBPAPP_5_1/build/build-distr.xml
Log:
JBPAPP-4489 Integrate HornetQ and JBM XA recovery into /server/SERVER-NAME/conf/jbossts-properties.xml

Modified: branches/JBPAPP_5_1/build/build-distr.xml
===================================================================
--- branches/JBPAPP_5_1/build/build-distr.xml	2010-08-04 14:54:47 UTC (rev 107386)
+++ branches/JBPAPP_5_1/build/build-distr.xml	2010-08-04 14:55:19 UTC (rev 107387)
@@ -2320,6 +2320,8 @@
        <copy tofile="${install.all.conf}/jbossts-properties.xml"
              filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossts-properties.xml-forJTA"/>
 
+     	<antcall target="apply_JBM_XA_Recovery_patch"/>
+
        <!-- copy optional JBossTS binaries from thirdparty repo -->
        <mkdir dir="${install.examples}/transactions"/>
        <copy todir="${install.examples}/transactions" filtering="no">
@@ -2351,4 +2353,10 @@
     <unjar src="${org.jboss.jopr.lib}/jopr-embedded-jbas5.war" dest="${install.server}/default/deploy/admin-console.war"/>
 
   </target>
+
+  <target name="apply_JBM_XA_Recovery_patch" unless="build.ewp">
+     <echo> "apply JBM XA Recovery patch"</echo>
+     <patch patchFile="jbossas-5-jbm-xa-recovery.patch" dir="${install.all.conf}" strip="0">
+     </patch>
+  </target>
 </project>

Added: branches/JBPAPP_5_1/build/jbossas-5-jbm-xa-recovery.patch
===================================================================
--- branches/JBPAPP_5_1/build/jbossas-5-jbm-xa-recovery.patch	                        (rev 0)
+++ branches/JBPAPP_5_1/build/jbossas-5-jbm-xa-recovery.patch	2010-08-04 14:55:19 UTC (rev 107387)
@@ -0,0 +1,11 @@
+--- jbossts-properties.xml.orig	2010-07-07 12:09:17.000000000 -0400
++++ jbossts-properties.xml     	2010-07-07 12:10:55.000000000 -0400
+@@ -239,6 +239,8 @@
+         <!--
+ 			com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple
+ 			-->
++        <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.JBMESSAGING1"
++           value="org.jboss.jms.server.recovery.MessagingXAResourceRecovery;java:/DefaultJMSProvider"/> 
+     </properties>
+     <properties depends="arjuna,txoj,jta" name="recoverymanager">
+         <!--