[jboss-svn-commits] JBL Code SVN: r37823 - in labs/jbosstm/branches/JBOSSTS_4_16/XTS: sar/tests and 1 other directories.

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

Author: zhfeng
Date: 2011-12-20 22:01:14 -0500 (Tue, 20 Dec 2011)
New Revision: 37823

Added:
   labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/dd/META-INF/manifest.mf
Modified:
   labs/jbosstm/branches/JBOSSTS_4_16/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/at/XTSATRecoveryManagerImple.java
   labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/build.xml
Log:
JBTM-1011 update to apply fix for XTSATRecoveryManagerImple

Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/at/XTSATRecoveryManagerImple.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/at/XTSATRecoveryManagerImple.java	2011-12-21 03:00:33 UTC (rev 37822)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/at/XTSATRecoveryManagerImple.java	2011-12-21 03:01:14 UTC (rev 37823)
@@ -260,7 +260,7 @@
 
         SubordinateATCoordinator[] coordinators = SubordinateATCoordinator.listRecoveredCoordinators();
         for (SubordinateATCoordinator coordinator : coordinators) {
-            if (coordinator.getSubordinateType() == SubordinateATCoordinator.SUBORDINATE_TX_TYPE_AT_AT && coordinator.isOrphaned()) {
+            if (coordinator.getSubordinateType().equals(SubordinateATCoordinator.SUBORDINATE_TX_TYPE_AT_AT) && coordinator.isOrphaned()) {
                 RecoveryLogger.i18NLogger.warn_participant_at_XTSATRecoveryModule_5(coordinator.get_uid());
                 coordinator.rollback();
             }

Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/build.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/build.xml	2011-12-21 03:00:33 UTC (rev 37822)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/build.xml	2011-12-21 03:01:14 UTC (rev 37823)
@@ -94,9 +94,8 @@
       <copy toDir="${build.classes.dir}/org/jboss/jbossts/xts/servicetests/generated/wsdl/" file="${wsdl.dir}/xtsservicetests.wsdl"/>
       <copy toDir="${build.classes.dir}/org/jboss/jbossts/xts/servicetests/service/" file="${dd.dir}/handlers.xml"/>
       <copy toDir="${build.classes.dir}/org/jboss/jbossts/xts/servicetests/service/subordinate" file="${dd.dir}/subordinatehandlers.xml"/>
-     <war warfile="${build.webapps.dir}/xtstest.war" webxml="${web.inf.dir}/web.xml">
+	 <war warfile="${build.webapps.dir}/xtstest.war" webxml="${web.inf.dir}/web.xml" manifest="${build.meta.inf.dir}/manifest.mf"> 
          <classes dir="${build.classes.dir}" includes="**/*"/>
-         <metainf dir="${build.meta.inf.dir}"/>
          <webinf dir="${dd.dir}" includes="wsdl/**"/>
      </war>
   </target>

Added: labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/dd/META-INF/manifest.mf
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/dd/META-INF/manifest.mf	                        (rev 0)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/dd/META-INF/manifest.mf	2011-12-21 03:01:14 UTC (rev 37823)
@@ -0,0 +1 @@
+Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts,org.jboss.ws.jaxws-client services export,org.jboss.ws.cxf.jbossws-cxf-client services export