[jboss-cvs] JBossAS SVN: r83329 - in branches/Branch_5_x: testsuite and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 22 15:56:00 EST 2009
Author: smcgowan at redhat.com
Date: 2009-01-22 15:56:00 -0500 (Thu, 22 Jan 2009)
New Revision: 83329
Modified:
branches/Branch_5_x/component-matrix/pom.xml
branches/Branch_5_x/testsuite/build.xml
branches/Branch_5_x/testsuite/imports/server-config.xml
Log:
JBAS-6406, JBAS-6409
Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml 2009-01-22 20:48:53 UTC (rev 83328)
+++ branches/Branch_5_x/component-matrix/pom.xml 2009-01-22 20:56:00 UTC (rev 83329)
@@ -1265,7 +1265,7 @@
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-server-manager</artifactId>
- <version>1.0.0.GA</version>
+ <version>1.0.1.GA</version>
<exclusions>
<exclusion>
<groupId>org.jboss.jbossas</groupId>
Modified: branches/Branch_5_x/testsuite/build.xml
===================================================================
--- branches/Branch_5_x/testsuite/build.xml 2009-01-22 20:48:53 UTC (rev 83328)
+++ branches/Branch_5_x/testsuite/build.xml 2009-01-22 20:56:00 UTC (rev 83329)
@@ -3583,10 +3583,22 @@
<test-compatibility client-version="4_2_x" label="15c-15s" client-jdk="${jdk15}" server-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility client-version="4_2_x" label="15c-16s" client-jdk="${jdk15}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility client-version="4_2_x" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility client-version="4_2_3_GA" label="15c-15s" client-jdk="${jdk15}" server-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility client-version="4_2_3_GA" label="15c-16s" client-jdk="${jdk15}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility client-version="4_2_3_GA" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility client-version="5_0_0_GA" label="15c-15s" client-jdk="${jdk15}" server-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility client-version="5_0_0_GA" label="15c-16s" client-jdk="${jdk15}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility client-version="5_0_0_GA" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<!-- testing interoperating with clients using the pooled invokers -->
<test-compatibility-pooled-invokers label="15c-15s" client-version="4_2_x" client-jdk="${jdk15}" server-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility-pooled-invokers label="15c-16s" client-version="4_2_x" client-jdk="${jdk15}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility-pooled-invokers label="16c-16s" client-version="4_2_x" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility-pooled-invokers label="15c-15s" client-version="4_2_3_GA" client-jdk="${jdk15}" server-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility-pooled-invokers label="15c-16s" client-version="4_2_3_GA" client-jdk="${jdk15}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility-pooled-invokers label="16c-16s" client-version="4_2_3_GA" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility-pooled-invokers label="15c-15s" client-version="5_0_0_GA" client-jdk="${jdk15}" server-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility-pooled-invokers label="15c-16s" client-version="5_0_0_GA" client-jdk="${jdk15}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility-pooled-invokers label="16c-16s" client-version="5_0_0_GA" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
</target>
<macrodef name="test-compatibility-pooled-invokers">
Modified: branches/Branch_5_x/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_5_x/testsuite/imports/server-config.xml 2009-01-22 20:48:53 UTC (rev 83328)
+++ branches/Branch_5_x/testsuite/imports/server-config.xml 2009-01-22 20:56:00 UTC (rev 83329)
@@ -84,7 +84,7 @@
<server:config javaHome="${env.JAVA_HOME}" jbossHome="${jboss.dist}"
udpGroup="${udpGroup}">
- <server name="all" host="${node0}" partition="${partitionName}">
+ <server name="all" host="${node0}">
<!--
<jvmarg value="-agentlib:yjpagent" />
<jvmarg value="-Xrunyjpagent:sessionname=JBoss" />
@@ -279,7 +279,7 @@
<sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
<sysproperty key="jboss.messaging.ServerPeerID" value="1" />
</server>
- <server name="cluster-udp-0" host="${node0}" partition="${partitionName}">
+ <server name="cluster-udp-0" host="${node0}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
@@ -290,8 +290,9 @@
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="jboss.messaging.ServerPeerID" value="0" />
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="jboss.partition.name" value="${partitionName}" />
</server>
- <server name="cluster-udp-1" host="${node1}" partition="${partitionName}">
+ <server name="cluster-udp-1" host="${node1}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
@@ -302,6 +303,7 @@
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="jboss.messaging.ServerPeerID" value="1" />
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="jboss.partition.name" value="${partitionName}" />
</server>
<server name="cluster-field-udp-0" host="${node0}">
<jvmarg value="-Xms128m" />
@@ -421,7 +423,7 @@
<sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
<sysproperty key="jboss.messaging.ServerPeerID" value="1" />
</server>
- <server name="cluster-tcp-0" host="${node0}" partition="${partitionName}">
+ <server name="cluster-tcp-0" host="${node0}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
@@ -433,8 +435,9 @@
<sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7600],${node1}[7600]"/>
<sysproperty key="jboss.messaging.ServerPeerID" value="0" />
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="jboss.partition.name" value="${partitionName}" />
</server>
- <server name="cluster-tcp-1" host="${node1}" partition="${partitionName}">
+ <server name="cluster-tcp-1" host="${node1}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
@@ -446,6 +449,7 @@
<sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7600],${node1}[7600]"/>
<sysproperty key="jboss.messaging.ServerPeerID" value="1" />
<sysproperty key="node0.bind.address" value="${node0}" />
+ <sysproperty key="jboss.partition.name" value="${partitionName}" />
</server>
<server name="cluster-tcp-sync-0" host="${node0}">
<jvmarg value="-Xms128m" />
More information about the jboss-cvs-commits
mailing list