[jboss-cvs] JBossAS SVN: r71393 - in trunk/testsuite: imports and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 28 14:56:15 EDT 2008
Author: bstansberry at jboss.com
Date: 2008-03-28 14:56:15 -0400 (Fri, 28 Mar 2008)
New Revision: 71393
Modified:
trunk/testsuite/build.xml
trunk/testsuite/imports/server-config.xml
Log:
Get rid of unused clustering server configs
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2008-03-28 18:55:53 UTC (rev 71392)
+++ trunk/testsuite/build.xml 2008-03-28 18:56:15 UTC (rev 71393)
@@ -2957,15 +2957,6 @@
<server:stop name="cluster-tcp-0"/>
<server:stop name="cluster-tcp-1"/>
- <!-- Test a TCP_NIO stack.-->
- <antcall target="tests-clustering-configure">
- <param name="jboss-junit-configuration" value="tcp_nio"/>
- </antcall>
- <server:start name="cluster-tcp_nio-0"/>
- <server:start name="cluster-tcp_nio-1"/>
- <server:stop name="cluster-tcp_nio-0"/>
- <server:stop name="cluster-tcp_nio-1"/>
-
<!-- Test the field UDP stack -->
<antcall target="tests-clustering-field-configure">
<param name="cluster.includes.refid" value="cluster.field.includes"/>
@@ -2990,19 +2981,7 @@
<server:start name="cluster-field-tcp-1"/>
<server:stop name="cluster-field-tcp-0"/>
<server:stop name="cluster-field-tcp-1"/>
- <!-- Test the field TCP_NIO stack -->
- <antcall target="tests-clustering-field-configure">
- <param name="cluster.includes.refid" value="cluster.field.includes"/>
- <param name="jboss-junit-configuration" value="tcp_nio"/>
- <param name="jbosstest.cluster.node0.config" value="cluster-field-tcp_nio-0"/>
- <param name="jbosstest.cluster.node1.config" value="cluster-field-tcp_nio-1"/>
- </antcall>
- <server:start name="cluster-field-tcp_nio-0"/>
- <server:start name="cluster-field-tcp_nio-1"/>
- <server:stop name="cluster-field-tcp_nio-0"/>
- <server:stop name="cluster-field-tcp_nio-1"/>
-
<!-- Create the sso enabled tomcat config starting with the all config -->
<create-cluster-sso-node newconf="tomcat-sso-cluster0"/>
<create-cluster-sso-node newconf="tomcat-sso-cluster1"/>
@@ -3017,21 +2996,6 @@
<server:stop name="tomcat-sso-cluster0"/>
<server:stop name="tomcat-sso-cluster1"/>
- <!-- Do it again with BR enabled -->
-
- <create-cluster-sso-node newconf="tomcat-sso-cluster-br0"/>
- <create-cluster-sso-node newconf="tomcat-sso-cluster-br1"/>
-
- <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK"/>
- <http-cluster-node-config-change conf="tomcat-sso-cluster-br0" useBuddyRepl="true"/>
- <http-cluster-node-config-change conf="tomcat-sso-cluster-br1" useBuddyRepl="true"/>
-
- <server:start name="tomcat-sso-cluster-br0"/>
- <server:start name="tomcat-sso-cluster-br1"/>
-
- <server:stop name="tomcat-sso-cluster-br0"/>
- <server:stop name="tomcat-sso-cluster-br1"/>
-
<!-- tomcat-webctx -->
<create-config baseconf="default" newconf="tomcat-webctx"
newconf-src="tomcat-webctx">
Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml 2008-03-28 18:55:53 UTC (rev 71392)
+++ trunk/testsuite/imports/server-config.xml 2008-03-28 18:56:15 UTC (rev 71393)
@@ -545,152 +545,6 @@
<sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
<sysproperty key="jboss.messaging.ServerPeerID" value="1" />
</server>
- <server name="cluster-tcp_nio-0" host="${node0}">
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx512m" />
- <jvmarg value="-XX:MaxPermSize=512m" />
- <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
- <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp_nio" />
- <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7700],${node1}[7700]"/>
- <sysproperty key="jboss.messaging.ServerPeerID" value="0" />
- <sysproperty key="node0.bind.address" value="${node0}" />
- </server>
- <server name="cluster-tcp_nio-1" host="${node1}">
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx512m" />
- <jvmarg value="-XX:MaxPermSize=512m" />
- <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
- <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp_nio" />
- <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7700],${node1}[7700]"/>
- <sysproperty key="jboss.messaging.ServerPeerID" value="1" />
- <sysproperty key="node0.bind.address" value="${node0}" />
- </server>
- <server name="cluster-field-tcp_nio-0" host="${node0}">
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx512m" />
- <jvmarg value="-XX:MaxPermSize=512m" />
- <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
- <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp_nio" />
- <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7700],${node1}[7700]"/>
- <sysproperty key="jboss.messaging.ServerPeerID" value="0" />
- </server>
- <server name="cluster-field-tcp_nio-1" host="${node1}">
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx512m" />
- <jvmarg value="-XX:MaxPermSize=512m" />
- <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
- <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp_nio" />
- <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7700],${node1}[7700]"/>
- <sysproperty key="jboss.messaging.ServerPeerID" value="1" />
- </server>
- <server name="cluster-tcp_nio-SYNC-0" host="${node0}">
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx512m" />
- <jvmarg value="-XX:MaxPermSize=512m" />
- <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
- <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
- <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/>
- <sysproperty key="jboss.messaging.ServerPeerID" value="0" />
- </server>
- <server name="cluster-tcp_nio-SYNC-1" host="${node1}">
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx512m" />
- <jvmarg value="-XX:MaxPermSize=512m" />
- <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
- <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
- <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/>
- <sysproperty key="jboss.messaging.ServerPeerID" value="1" />
- </server>
- <server name="cluster-field-tcp_nio-SYNC-0" host="${node0}">
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx512m" />
- <jvmarg value="-XX:MaxPermSize=512m" />
- <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
- <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
- <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/>
- <sysproperty key="jboss.messaging.ServerPeerID" value="0" />
- </server>
- <server name="cluster-field-tcp_nio-SYNC-1" host="${node1}">
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx512m" />
- <jvmarg value="-XX:MaxPermSize=512m" />
- <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
- <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
- <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/>
- <sysproperty key="jboss.messaging.ServerPeerID" value="1" />
- </server>
- <server name="cluster-tcp_nio-BR-0" host="${node0}">
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx512m" />
- <jvmarg value="-XX:MaxPermSize=512m" />
- <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
- <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
- <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/>
- <sysproperty key="jboss.messaging.ServerPeerID" value="0" />
- </server>
- <server name="cluster-tcp_nio-BR-1" host="${node1}">
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx512m" />
- <jvmarg value="-XX:MaxPermSize=512m" />
- <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
- <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
- <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/>
- <sysproperty key="jboss.messaging.ServerPeerID" value="1" />
- </server>
- <server name="cluster-field-tcp_nio-BR-0" host="${node0}">
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx512m" />
- <jvmarg value="-XX:MaxPermSize=512m" />
- <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
- <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
- <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/>
- <sysproperty key="jboss.messaging.ServerPeerID" value="0" />
- </server>
- <server name="cluster-field-tcp_nio-BR-1" host="${node1}">
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx512m" />
- <jvmarg value="-XX:MaxPermSize=512m" />
- <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
- <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
- <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/>
- <sysproperty key="jboss.messaging.ServerPeerID" value="1" />
- </server>
<server name="tomcat-sso-cluster0" host="${node0}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
@@ -713,28 +567,6 @@
<sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
<sysproperty key="jboss.messaging.ServerPeerID" value="1" />
</server>
- <server name="tomcat-sso-cluster-br0" host="${node0}">
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx512m" />
- <jvmarg value="-XX:MaxPermSize=512m" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
- <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
- <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
- <sysproperty key="jboss.messaging.ServerPeerID" value="0" />
- </server>
- <server name="tomcat-sso-cluster-br1" host="${node1}">
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx512m" />
- <jvmarg value="-XX:MaxPermSize=512m" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
- <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
- <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
- <sysproperty key="jboss.messaging.ServerPeerID" value="1" />
- </server>
<server name="binding-manager1" host="${node0}" httpPort="8180" rmiPort="1199">
<sysproperty key="java.net.preferIPv4Stack" value="true" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
More information about the jboss-cvs-commits
mailing list