[jboss-cvs] JBossAS SVN: r83328 - in trunk: testsuite and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 22 15:48:54 EST 2009
Author: smcgowan at redhat.com
Date: 2009-01-22 15:48:53 -0500 (Thu, 22 Jan 2009)
New Revision: 83328
Modified:
trunk/component-matrix/pom.xml
trunk/testsuite/build.xml
trunk/testsuite/imports/server-config.xml
Log:
JBAS-6406, JBAS-6409
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2009-01-22 20:06:22 UTC (rev 83327)
+++ trunk/component-matrix/pom.xml 2009-01-22 20:48:53 UTC (rev 83328)
@@ -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: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2009-01-22 20:06:22 UTC (rev 83327)
+++ trunk/testsuite/build.xml 2009-01-22 20:48:53 UTC (rev 83328)
@@ -3578,17 +3578,16 @@
<target name="tests-matrix" description="Executes only the version check compatibility suite. Use -Dmatrix-versions=[version container] for this task" depends="maybejars" if="matrix-versions">
<fail message="Use -Dmatrix-versions=[version container] for this task" unless="matrix-versions"/>
- <fail message="Set -Djdk15= to a JDK1.5 installation" unless="HAVE_JDK_1.5"/>
- <!--<fail message="Set -Djdk16= to a JDK1.6 installation" unless="HAVE_JDK_1.6"/>-->
+ <fail message="Set -Djdk16= to a JDK1.6 installation" unless="HAVE_JDK_1.6"/>
<!-- testing interoperating with clients using the unified invokers over jboss remoting -->
- <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="16c-16s" client-jdk="${jdk16}" 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="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="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: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml 2009-01-22 20:06:22 UTC (rev 83327)
+++ trunk/testsuite/imports/server-config.xml 2009-01-22 20:48:53 UTC (rev 83328)
@@ -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" />
@@ -285,7 +285,7 @@
<sysproperty key="jboss.messaging.ServerPeerID" value="1" />
<sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
</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" />
@@ -296,9 +296,10 @@
<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}" />
<sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
</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" />
@@ -309,6 +310,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}" />
<sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
</server>
<server name="cluster-field-udp-0" host="${node0}">
@@ -439,7 +441,7 @@
<sysproperty key="jboss.messaging.ServerPeerID" value="1" />
<sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
</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" />
@@ -451,9 +453,10 @@
<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}" />
<sysproperty key="jgroups.bind_addr" value="${node0.jgroups.bind_addr}" />
</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" />
@@ -465,6 +468,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}" />
<sysproperty key="jgroups.bind_addr" value="${node1.jgroups.bind_addr}" />
</server>
<server name="cluster-tcp-sync-0" host="${node0}">
More information about the jboss-cvs-commits
mailing list