[jboss-cvs] JBoss Messaging SVN: r3282 - in branches/Branch_Stable: src/main/org/jboss/messaging/util and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 1 11:32:29 EDT 2007
Author: timfox
Date: 2007-11-01 11:32:29 -0400 (Thu, 01 Nov 2007)
New Revision: 3282
Modified:
branches/Branch_Stable/src/etc/server/default/deploy/db2-persistence-service.xml
branches/Branch_Stable/src/etc/server/default/deploy/mssql-persistence-service.xml
branches/Branch_Stable/src/etc/server/default/deploy/mysql-persistence-service.xml
branches/Branch_Stable/src/etc/server/default/deploy/mysqlcluster-persistence-service.xml
branches/Branch_Stable/src/etc/server/default/deploy/oracle-persistence-service.xml
branches/Branch_Stable/src/etc/server/default/deploy/postgresql-persistence-service.xml
branches/Branch_Stable/src/etc/server/default/deploy/sybase-persistence-service.xml
branches/Branch_Stable/src/main/org/jboss/messaging/util/XMLUtil.java
branches/Branch_Stable/tests/build.xml
branches/Branch_Stable/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
Log:
Allow ip_ttl to be overridden for Hudson
Modified: branches/Branch_Stable/src/etc/server/default/deploy/db2-persistence-service.xml
===================================================================
--- branches/Branch_Stable/src/etc/server/default/deploy/db2-persistence-service.xml 2007-10-31 20:18:39 UTC (rev 3281)
+++ branches/Branch_Stable/src/etc/server/default/deploy/db2-persistence-service.xml 2007-11-01 15:32:29 UTC (rev 3282)
@@ -160,7 +160,7 @@
bind_to_all_interfaces="true"
mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
mcast_port="${jboss.messaging.datachanneludpport:45567}"
- ip_ttl="8"
+ ip_ttl="${jboss.messaging.ipttl:8}"
num_initial_members="2"
num_ping_requests="1"/>
<MERGE2 max_interval="100000"
@@ -201,7 +201,7 @@
max_bundle_timeout="30"
use_incoming_packet_handler="true"
use_outgoing_packet_handler="false"
- ip_ttl="2"
+ ip_ttl="${jboss.messaging.ipttl:2}"
down_thread="false" up_thread="false"
enable_bundling="false"/>
<PING timeout="2000"
Modified: branches/Branch_Stable/src/etc/server/default/deploy/mssql-persistence-service.xml
===================================================================
--- branches/Branch_Stable/src/etc/server/default/deploy/mssql-persistence-service.xml 2007-10-31 20:18:39 UTC (rev 3281)
+++ branches/Branch_Stable/src/etc/server/default/deploy/mssql-persistence-service.xml 2007-11-01 15:32:29 UTC (rev 3282)
@@ -163,7 +163,7 @@
bind_to_all_interfaces="true"
mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
mcast_port="${jboss.messaging.datachanneludpport:45567}"
- ip_ttl="8"
+ ip_ttl="${jboss.messaging.ipttl:8}"
num_initial_members="2"
num_ping_requests="1"/>
<MERGE2 max_interval="100000"
@@ -204,7 +204,7 @@
max_bundle_timeout="30"
use_incoming_packet_handler="true"
use_outgoing_packet_handler="false"
- ip_ttl="2"
+ ip_ttl="${jboss.messaging.ipttl:2}"
down_thread="false" up_thread="false"
enable_bundling="false"/>
<PING timeout="2000"
Modified: branches/Branch_Stable/src/etc/server/default/deploy/mysql-persistence-service.xml
===================================================================
--- branches/Branch_Stable/src/etc/server/default/deploy/mysql-persistence-service.xml 2007-10-31 20:18:39 UTC (rev 3281)
+++ branches/Branch_Stable/src/etc/server/default/deploy/mysql-persistence-service.xml 2007-11-01 15:32:29 UTC (rev 3282)
@@ -163,7 +163,7 @@
bind_to_all_interfaces="true"
mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
mcast_port="${jboss.messaging.datachanneludpport:45567}"
- ip_ttl="8"
+ ip_ttl="${jboss.messaging.ipttl:8}"
num_initial_members="2"
num_ping_requests="1"/>
<MERGE2 max_interval="100000"
@@ -204,7 +204,7 @@
max_bundle_timeout="30"
use_incoming_packet_handler="true"
use_outgoing_packet_handler="false"
- ip_ttl="2"
+ ip_ttl="${jboss.messaging.ipttl:2}"
down_thread="false" up_thread="false"
enable_bundling="false"/>
<PING timeout="2000"
Modified: branches/Branch_Stable/src/etc/server/default/deploy/mysqlcluster-persistence-service.xml
===================================================================
--- branches/Branch_Stable/src/etc/server/default/deploy/mysqlcluster-persistence-service.xml 2007-10-31 20:18:39 UTC (rev 3281)
+++ branches/Branch_Stable/src/etc/server/default/deploy/mysqlcluster-persistence-service.xml 2007-11-01 15:32:29 UTC (rev 3282)
@@ -163,7 +163,7 @@
bind_to_all_interfaces="true"
mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
mcast_port="${jboss.messaging.datachanneludpport:45567}"
- ip_ttl="8"
+ ip_ttl="${jboss.messaging.ipttl:8}"
num_initial_members="2"
num_ping_requests="1"/>
<MERGE2 max_interval="100000"
@@ -204,7 +204,7 @@
max_bundle_timeout="30"
use_incoming_packet_handler="true"
use_outgoing_packet_handler="false"
- ip_ttl="2"
+ ip_ttl="${jboss.messaging.ipttl:2}"
down_thread="false" up_thread="false"
enable_bundling="false"/>
<PING timeout="2000"
@@ -232,7 +232,7 @@
<pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/>
<pbcast.FLUSH down_thread="false" up_thread="false" timeout="20000" auto_flush_conf="false"/>
</config>
- </attribute>
+ </attribute>
</mbean>
Modified: branches/Branch_Stable/src/etc/server/default/deploy/oracle-persistence-service.xml
===================================================================
--- branches/Branch_Stable/src/etc/server/default/deploy/oracle-persistence-service.xml 2007-10-31 20:18:39 UTC (rev 3281)
+++ branches/Branch_Stable/src/etc/server/default/deploy/oracle-persistence-service.xml 2007-11-01 15:32:29 UTC (rev 3282)
@@ -167,7 +167,7 @@
bind_to_all_interfaces="true"
mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
mcast_port="${jboss.messaging.datachanneludpport:45567}"
- ip_ttl="8"
+ ip_ttl="${jboss.messaging.ipttl:8}"
num_initial_members="2"
num_ping_requests="1"/>
<MERGE2 max_interval="100000"
@@ -208,7 +208,7 @@
max_bundle_timeout="30"
use_incoming_packet_handler="true"
use_outgoing_packet_handler="false"
- ip_ttl="2"
+ ip_ttl="${jboss.messaging.ipttl:2}"
down_thread="false" up_thread="false"
enable_bundling="false"/>
<PING timeout="2000"
@@ -236,7 +236,7 @@
<pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/>
<pbcast.FLUSH down_thread="false" up_thread="false" timeout="20000" auto_flush_conf="false"/>
</config>
- </attribute>
+ </attribute>
</mbean>
<!-- Messaging JMS User Manager MBean config
Modified: branches/Branch_Stable/src/etc/server/default/deploy/postgresql-persistence-service.xml
===================================================================
--- branches/Branch_Stable/src/etc/server/default/deploy/postgresql-persistence-service.xml 2007-10-31 20:18:39 UTC (rev 3281)
+++ branches/Branch_Stable/src/etc/server/default/deploy/postgresql-persistence-service.xml 2007-11-01 15:32:29 UTC (rev 3282)
@@ -174,7 +174,7 @@
bind_to_all_interfaces="true"
mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
mcast_port="${jboss.messaging.datachanneludpport:45567}"
- ip_ttl="8"
+ ip_ttl="${jboss.messaging.ipttl:8}"
num_initial_members="2"
num_ping_requests="1"/>
<MERGE2 max_interval="100000"
@@ -215,7 +215,7 @@
max_bundle_timeout="30"
use_incoming_packet_handler="true"
use_outgoing_packet_handler="false"
- ip_ttl="2"
+ ip_ttl="${jboss.messaging.ipttl:2}"
down_thread="false" up_thread="false"
enable_bundling="false"/>
<PING timeout="2000"
Modified: branches/Branch_Stable/src/etc/server/default/deploy/sybase-persistence-service.xml
===================================================================
--- branches/Branch_Stable/src/etc/server/default/deploy/sybase-persistence-service.xml 2007-10-31 20:18:39 UTC (rev 3281)
+++ branches/Branch_Stable/src/etc/server/default/deploy/sybase-persistence-service.xml 2007-11-01 15:32:29 UTC (rev 3282)
@@ -168,7 +168,7 @@
bind_to_all_interfaces="true"
mcast_addr="${jboss.messaging.datachanneludpaddress:228.6.6.6}"
mcast_port="${jboss.messaging.datachanneludpport:45567}"
- ip_ttl="8"
+ ip_ttl="${jboss.messaging.ipttl:8}"
num_initial_members="2"
num_ping_requests="1"/>
<MERGE2 max_interval="100000"
@@ -209,7 +209,7 @@
max_bundle_timeout="30"
use_incoming_packet_handler="true"
use_outgoing_packet_handler="false"
- ip_ttl="2"
+ ip_ttl="${jboss.messaging.ipttl:2}"
down_thread="false" up_thread="false"
enable_bundling="false"/>
<PING timeout="2000"
@@ -237,7 +237,7 @@
<pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/>
<pbcast.FLUSH down_thread="false" up_thread="false" timeout="20000" auto_flush_conf="false"/>
</config>
- </attribute>
+ </attribute>
</mbean>
<!-- Messaging JMS User Manager MBean config
Modified: branches/Branch_Stable/src/main/org/jboss/messaging/util/XMLUtil.java
===================================================================
--- branches/Branch_Stable/src/main/org/jboss/messaging/util/XMLUtil.java 2007-10-31 20:18:39 UTC (rev 3281)
+++ branches/Branch_Stable/src/main/org/jboss/messaging/util/XMLUtil.java 2007-11-01 15:32:29 UTC (rev 3282)
@@ -65,6 +65,8 @@
s = doReplace(s, "jboss.messaging.controlchanneludpaddress", "228.7.7.7");
s = doReplace(s, "jboss.messaging.datachanneludpport", "45567");
s = doReplace(s, "jboss.messaging.controlchanneludpport", "45568");
+ s = doReplace(s, "jboss.messaging.ipttl", "2");
+ s = doReplace(s, "jboss.messaging.ipttl", "8");
StringReader sreader = new StringReader(s);
Modified: branches/Branch_Stable/tests/build.xml
===================================================================
--- branches/Branch_Stable/tests/build.xml 2007-10-31 20:18:39 UTC (rev 3281)
+++ branches/Branch_Stable/tests/build.xml 2007-11-01 15:32:29 UTC (rev 3282)
@@ -55,6 +55,9 @@
<property name="jboss.messaging.groupname" value="MessagingPostOffice"/>
<property name="jboss.messaging.datachanneludpport" value="45567"/>
<property name="jboss.messaging.controlchanneludpport" value="45568"/>
+ <property name="jboss.messaging.datachanneludpaddress" value="228.6.6.6"/>
+ <property name="jboss.messaging.controlchanneludpaddress" value="228.7.7.7"/>
+ <property name="jboss.messaging.ipttl" value="0"/>
<!--
Functional tests.
@@ -332,6 +335,9 @@
<sysproperty key="jboss.messaging.groupname" value="${jboss.messaging.groupname}"/>
<sysproperty key="jboss.messaging.datachanneludpport" value="${jboss.messaging.datachanneludpport}"/>
<sysproperty key="jboss.messaging.controlchanneludpport" value="${jboss.messaging.controlchanneludpport}"/>
+ <sysproperty key="jboss.messaging.datachanneludpaddress" value="${jboss.messaging.datachanneludpaddress}"/>
+ <sysproperty key="jboss.messaging.controlchanneludpaddress" value="${jboss.messaging.controlchanneludpaddress}"/>
+ <sysproperty key="jboss.messaging.ipttl" value="${jboss.messaging.ipttl}"/>
<sysproperty key="test.database" value="${functional.tests.database}"/>
<sysproperty key="test.logfile.suffix" value="invm"/>
<sysproperty key="build.lib" value="${build.lib}"/>
@@ -734,6 +740,9 @@
<sysproperty key="jboss.messaging.groupname" value="${jboss.messaging.groupname}"/>
<sysproperty key="jboss.messaging.datachanneludpport" value="${jboss.messaging.datachanneludpport}"/>
<sysproperty key="jboss.messaging.controlchanneludpport" value="${jboss.messaging.controlchanneludpport}"/>
+ <sysproperty key="jboss.messaging.datachanneludpaddress" value="${jboss.messaging.datachanneludpaddress}"/>
+ <sysproperty key="jboss.messaging.controlchanneludpaddress" value="${jboss.messaging.controlchanneludpaddress}"/>
+ <sysproperty key="jboss.messaging.ipttl" value="${jboss.messaging.ipttl}"/>
<sysproperty key="jgroups.bind_addr" value="${test.bind.address}"/>
<sysproperty key="test.database" value="${clustering.tests.database}"/>
<sysproperty key="test.clustered" value="true"/>
Modified: branches/Branch_Stable/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
===================================================================
--- branches/Branch_Stable/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2007-10-31 20:18:39 UTC (rev 3281)
+++ branches/Branch_Stable/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2007-11-01 15:32:29 UTC (rev 3282)
@@ -470,6 +470,13 @@
sb.append("-Djboss.messaging.controlchanneludpaddress=").append(controlChannelUDPAddress).append(' ');
}
+ String ipttl = System.getProperty("jboss.messaging.ipttl");
+ log.info("*** ip_ttl is " + ipttl);
+ if (ipttl != null)
+ {
+ sb.append("-Djboss.messaging.ipttl=").append(ipttl).append(' ');
+ }
+
String testLogfileSuffix = System.getProperty("test.logfile.suffix");
if (testLogfileSuffix == null)
More information about the jboss-cvs-commits
mailing list