[jboss-cvs] JBossAS SVN: r61176 - in branches/Branch_4_2/testsuite: src/main/org/jboss/test/cluster/test and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 6 23:43:43 EST 2007
Author: bstansberry at jboss.com
Date: 2007-03-06 23:43:43 -0500 (Tue, 06 Mar 2007)
New Revision: 61176
Modified:
branches/Branch_4_2/testsuite/imports/server-config.xml
branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/HAJndiTestCase.java
branches/Branch_4_2/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java
branches/Branch_4_2/testsuite/src/main/org/jboss/test/testbeancluster/test/RetryInterceptorUnitTestCase.java
Log:
Use a name for the multicast TTL property that will get passed in to the test client
Modified: branches/Branch_4_2/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_4_2/testsuite/imports/server-config.xml 2007-03-07 03:36:37 UTC (rev 61175)
+++ branches/Branch_4_2/testsuite/imports/server-config.xml 2007-03-07 04:43:43 UTC (rev 61176)
@@ -55,7 +55,9 @@
</not>
</condition>
- <property name="jgroups.udp.ip_ttl" value="0"/>
+ <!-- TTL for multicast packets. Use jbosstest namespace
+ so it gets passed in to test client as well -->
+ <property name="jbosstest.udp.ip_ttl" value="0"/>
<taskdef name="config" classname="org.jboss.ant.taskdefs.server.ConfigManagerTask"
uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
@@ -78,7 +80,7 @@
<jvmarg value="${jpda.cmdline}" />
<jvmarg value="-Xmx128m" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="securitymgr" config="default" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
@@ -93,12 +95,12 @@
<server name="scoped-aop" config="all" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
<jvmarg value="-Xbootclasspath/p:${jboss.dist}/bin/jdk14-pluggable-instrumentor.jar${separator}${jboss.dist}/bin/woven-classloader"/>
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="scoped-aop-jdk50" config="all" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
<jvmarg value="-javaagent:pluggable-instrumentor.jar"/>
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="jacc-securitymgr" host="${node0}" config="jacc-securitymgr">
<jvmarg value="${jpda.cmdline}" />
@@ -145,135 +147,135 @@
</server>
<server name="node0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="node1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-UDP-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-UDP-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-field-UDP-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-field-UDP-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-UDP-SYNC-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-UDP-SYNC-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-field-UDP-SYNC-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-field-UDP-SYNC-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-UDP-BR-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-UDP-BR-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-field-UDP-BR-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-field-UDP-BR-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-TCP-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-TCP-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-field-TCP-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-field-TCP-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-TCP-SYNC-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-TCP-SYNC-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-field-TCP-SYNC-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-field-TCP-SYNC-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-TCP-BR-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-TCP-BR-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-field-TCP-BR-0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="cluster-field-TCP-BR-1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="tomcat-sso-cluster0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="tomcat-sso-cluster1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="tomcat-sso-cluster-br0" host="${node0}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="tomcat-sso-cluster-br1" host="${node1}">
<sysproperty key="resolve.dns" value="false" />
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="dtm0" host="${node0}">
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="dtm1" host="${node1}"/>
<server name="dtm2" host="${node2}"/>
<server name="dtm3" host="${node3}"/>
<server name="binding-manager1" host="${node0}" httpPort="8180" rmiPort="1199">
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="binding-manager2" host="${node0}" httpPort="8280" rmiPort="1299">
- <sysproperty key="jgroups.udp.ip_ttl" value="${jgroups.udp.ip_ttl}" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
<server name="jrmp-invoker" host="${node0}"/>
<server name="minimal" host="${node0}" hasWebServer="false"/>
Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/HAJndiTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/HAJndiTestCase.java 2007-03-07 03:36:37 UTC (rev 61175)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/HAJndiTestCase.java 2007-03-07 04:43:43 UTC (rev 61176)
@@ -49,7 +49,7 @@
private static final String NODE0_HAJNDI = System.getProperty("node0.hajndi.url");
private static final String NODE1_HAJNDI = System.getProperty("node1.hajndi.url");
private static final String DISCOVERY_GROUP = System.getProperty("jbosstest.udpGroup");
- private static final String DISCOVERY_TTL = System.getProperty("jgroups.udp.ip_ttl", "1");
+ private static final String DISCOVERY_TTL = System.getProperty("jbosstest.udp.ip_ttl", "1");
// BINDING KEYS and VALUES
private static final String LOCAL0_KEY = "org.jboss.test.cluster.test.Local0Key";
Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java 2007-03-07 03:36:37 UTC (rev 61175)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java 2007-03-07 04:43:43 UTC (rev 61176)
@@ -41,7 +41,7 @@
*/
public class SimpleUnitTestCase extends JBossTestCase
{
- private static final String DISCOVERY_TTL = System.getProperty("jgroups.udp.ip_ttl", "1");
+ private static final String DISCOVERY_TTL = System.getProperty("jbosstest.udp.ip_ttl", "1");
private static final String DISCOVERY_GROUP = System.getProperty("jbosstest.udpGroup", "");
/**
Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/testbeancluster/test/RetryInterceptorUnitTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/testbeancluster/test/RetryInterceptorUnitTestCase.java 2007-03-07 03:36:37 UTC (rev 61175)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/testbeancluster/test/RetryInterceptorUnitTestCase.java 2007-03-07 04:43:43 UTC (rev 61176)
@@ -57,7 +57,7 @@
*/
public class RetryInterceptorUnitTestCase extends JBossClusteredTestCase
{
- private static final String DISCOVERY_TTL = System.getProperty("jgroups.udp.ip_ttl", "1");
+ private static final String DISCOVERY_TTL = System.getProperty("jbosstest.udp.ip_ttl", "1");
private static final String DISCOVERY_GROUP = System.getProperty("jbosstest.udpGroup");
private static File customJndiDir = null;
More information about the jboss-cvs-commits
mailing list