[jboss-cvs] JBossAS SVN: r71528 - in branches/JBPAPP_4_2_0_GA_CP/testsuite: imports and 1 other directory.

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

Author: dwalluck at redhat.com
Date: 2008-03-31 18:14:11 -0400 (Mon, 31 Mar 2008)
New Revision: 71528

Modified:
   branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
   branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/server-config.xml
Log:
JBPAPP-656 - Upgrade JBoss Messaging to 1.4.0.SP3_CP02

Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml	2008-03-31 21:43:07 UTC (rev 71527)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml	2008-03-31 22:14:11 UTC (rev 71528)
@@ -1000,11 +1000,6 @@
              <include name="lib/**"/>
          </patternset>
       </create-config>
-      <replace file="${jboss.dist}/server/jbm-cluster2/deploy/jboss-messaging.sar/messaging-service.xml">
-         <replacefilter token="&lt;attribute name=&quot;ServerPeerID&quot;&gt;0&lt;/attribute&gt;"
-              value="&lt;attribute name=&quot;ServerPeerID&quot;&gt;1&lt;/attribute&gt;"/>
-      </replace>
-      
    </target>
 
    <target name="create-jbmnoncluster">

Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/server-config.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/server-config.xml	2008-03-31 21:43:07 UTC (rev 71527)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/server-config.xml	2008-03-31 22:14:11 UTC (rev 71528)
@@ -98,8 +98,8 @@
        <jvmarg value="-Xmx512m" />
        <jvmarg value="-XX:MaxPermSize=512m" />
        <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-        <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
-        <sysproperty key="java.net.preferIPv4Stack" value="true" />
+       <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+       <sysproperty key="java.net.preferIPv4Stack" value="true" />
     </server>
    	
     <server name="jbm-cluster2" host="${node1}">
@@ -111,6 +111,7 @@
        <sysproperty key="jbossnode0" value="${node0}"/>
        <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
         <sysproperty key="java.net.preferIPv4Stack" value="true" />
+        <sysproperty key="jboss.messaging.ServerPeerID" value="1" />
     </server>
 
     <server name="securitymgr" config="default" host="${node0}">