[jboss-cvs] JBoss Messaging SVN: r3255 - in trunk: src/main/org/jboss/messaging/core/impl/postoffice and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 29 06:38:53 EDT 2007
Author: timfox
Date: 2007-10-29 06:38:53 -0400 (Mon, 29 Oct 2007)
New Revision: 3255
Modified:
trunk/src/etc/server/default/deploy/db2-persistence-service.xml
trunk/src/etc/server/default/deploy/mssql-persistence-service.xml
trunk/src/etc/server/default/deploy/mysql-persistence-service.xml
trunk/src/etc/server/default/deploy/mysqlcluster-persistence-service.xml
trunk/src/etc/server/default/deploy/oracle-persistence-service.xml
trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml
trunk/src/etc/server/default/deploy/sybase-persistence-service.xml
trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
trunk/tests/build.properties
trunk/tests/build.xml
trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java
trunk/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPostOfficeTest.java
trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
Log:
Allow data and control channel udp ports to be overridden
Modified: trunk/src/etc/server/default/deploy/db2-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/db2-persistence-service.xml 2007-10-28 17:33:10 UTC (rev 3254)
+++ trunk/src/etc/server/default/deploy/db2-persistence-service.xml 2007-10-29 10:38:53 UTC (rev 3255)
@@ -158,7 +158,7 @@
<config>
<UDP
mcast_addr="228.8.8.8"
- mcast_port="45567"
+ mcast_port="${jboss.messaging.datachanneludpport:45567}"
tos="8"
ucast_recv_buf_size="20000000"
ucast_send_buf_size="640000"
@@ -190,24 +190,25 @@
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
down_thread="false" up_thread="false"
max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000"
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
down_thread="false" up_thread="false"
join_retry_timeout="2000" shun="false"
view_bundling="true"
view_ack_collection_timeout="5000"/>
<FC max_credits="2000000" down_thread="false" up_thread="false"
min_threshold="0.10"/>
- <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+ <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+
</config>
</attribute>
<!-- JGroups stack configuration to use for the control channel - used for control messages -->
-
+
<attribute name="ControlChannelConfig">
<config>
<UDP
mcast_addr="228.8.8.8"
- mcast_port="45568"
+ mcast_port="${jboss.messaging.controlchanneludpport:45568}"
tos="8"
ucast_recv_buf_size="20000000"
ucast_send_buf_size="640000"
@@ -247,7 +248,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: trunk/src/etc/server/default/deploy/mssql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/mssql-persistence-service.xml 2007-10-28 17:33:10 UTC (rev 3254)
+++ trunk/src/etc/server/default/deploy/mssql-persistence-service.xml 2007-10-29 10:38:53 UTC (rev 3255)
@@ -160,7 +160,7 @@
<config>
<UDP
mcast_addr="228.8.8.8"
- mcast_port="45567"
+ mcast_port="${jboss.messaging.datachanneludpport:45567}"
tos="8"
ucast_recv_buf_size="20000000"
ucast_send_buf_size="640000"
@@ -192,24 +192,25 @@
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
down_thread="false" up_thread="false"
max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000"
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
down_thread="false" up_thread="false"
join_retry_timeout="2000" shun="false"
view_bundling="true"
view_ack_collection_timeout="5000"/>
<FC max_credits="2000000" down_thread="false" up_thread="false"
min_threshold="0.10"/>
- <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+ <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+
</config>
</attribute>
<!-- JGroups stack configuration to use for the control channel - used for control messages -->
-
+
<attribute name="ControlChannelConfig">
<config>
<UDP
mcast_addr="228.8.8.8"
- mcast_port="45568"
+ mcast_port="${jboss.messaging.controlchanneludpport:45568}"
tos="8"
ucast_recv_buf_size="20000000"
ucast_send_buf_size="640000"
@@ -249,8 +250,8 @@
<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>
- </mbean>
+ </attribute>
+ </mbean>
<!-- Messaging JMS User Manager MBean config
======================================= -->
Modified: trunk/src/etc/server/default/deploy/mysql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/mysql-persistence-service.xml 2007-10-28 17:33:10 UTC (rev 3254)
+++ trunk/src/etc/server/default/deploy/mysql-persistence-service.xml 2007-10-29 10:38:53 UTC (rev 3255)
@@ -133,7 +133,7 @@
<!-- The JGroups group name that the post office will use -->
- <attribute name="GroupName">MessagingPostOffice</attribute>
+ <attribute name="GroupName">${jboss.messaging.groupname:MessagingPostOffice}</attribute>
<!-- Max time to wait for state to arrive when the post office joins the cluster -->
@@ -160,7 +160,7 @@
<config>
<UDP
mcast_addr="228.8.8.8"
- mcast_port="45567"
+ mcast_port="${jboss.messaging.datachanneludpport:45567}"
tos="8"
ucast_recv_buf_size="20000000"
ucast_send_buf_size="640000"
@@ -210,7 +210,7 @@
<config>
<UDP
mcast_addr="228.8.8.8"
- mcast_port="45568"
+ mcast_port="${jboss.messaging.controlchanneludpport:45568}"
tos="8"
ucast_recv_buf_size="20000000"
ucast_send_buf_size="640000"
Modified: trunk/src/etc/server/default/deploy/mysqlcluster-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/mysqlcluster-persistence-service.xml 2007-10-28 17:33:10 UTC (rev 3254)
+++ trunk/src/etc/server/default/deploy/mysqlcluster-persistence-service.xml 2007-10-29 10:38:53 UTC (rev 3255)
@@ -161,7 +161,7 @@
<config>
<UDP
mcast_addr="228.8.8.8"
- mcast_port="45567"
+ mcast_port="${jboss.messaging.datachanneludpport:45567}"
tos="8"
ucast_recv_buf_size="20000000"
ucast_send_buf_size="640000"
@@ -200,18 +200,18 @@
view_ack_collection_timeout="5000"/>
<FC max_credits="2000000" down_thread="false" up_thread="false"
min_threshold="0.10"/>
- <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
-
+ <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+
</config>
</attribute>
-
- <!-- JGroups stack configuration to use for the control channel - used for control messages -->
-
+
+ <!-- JGroups stack configuration to use for the control channel - used for control messages -->
+
<attribute name="ControlChannelConfig">
<config>
<UDP
mcast_addr="228.8.8.8"
- mcast_port="45568"
+ mcast_port="${jboss.messaging.controlchanneludpport:45568}"
tos="8"
ucast_recv_buf_size="20000000"
ucast_send_buf_size="640000"
@@ -251,8 +251,8 @@
<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: trunk/src/etc/server/default/deploy/oracle-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/oracle-persistence-service.xml 2007-10-28 17:33:10 UTC (rev 3254)
+++ trunk/src/etc/server/default/deploy/oracle-persistence-service.xml 2007-10-29 10:38:53 UTC (rev 3255)
@@ -164,7 +164,7 @@
<config>
<UDP
mcast_addr="228.8.8.8"
- mcast_port="45567"
+ mcast_port="${jboss.messaging.datachanneludpport:45567}"
tos="8"
ucast_recv_buf_size="20000000"
ucast_send_buf_size="640000"
@@ -196,24 +196,25 @@
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
down_thread="false" up_thread="false"
max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000"
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
down_thread="false" up_thread="false"
join_retry_timeout="2000" shun="false"
view_bundling="true"
view_ack_collection_timeout="5000"/>
<FC max_credits="2000000" down_thread="false" up_thread="false"
min_threshold="0.10"/>
- <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+ <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+
</config>
</attribute>
<!-- JGroups stack configuration to use for the control channel - used for control messages -->
-
+
<attribute name="ControlChannelConfig">
<config>
<UDP
mcast_addr="228.8.8.8"
- mcast_port="45568"
+ mcast_port="${jboss.messaging.controlchanneludpport:45568}"
tos="8"
ucast_recv_buf_size="20000000"
ucast_send_buf_size="640000"
@@ -253,7 +254,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: trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml 2007-10-28 17:33:10 UTC (rev 3254)
+++ trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml 2007-10-29 10:38:53 UTC (rev 3255)
@@ -157,11 +157,11 @@
<!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
- <attribute name="DataChannelConfig">
+ <attribute name="DataChannelConfig">
<config>
<UDP
mcast_addr="228.8.8.8"
- mcast_port="45567"
+ mcast_port="${jboss.messaging.datachanneludpport:45567}"
tos="8"
ucast_recv_buf_size="20000000"
ucast_send_buf_size="640000"
@@ -193,24 +193,25 @@
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
down_thread="false" up_thread="false"
max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000"
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
down_thread="false" up_thread="false"
join_retry_timeout="2000" shun="false"
view_bundling="true"
view_ack_collection_timeout="5000"/>
<FC max_credits="2000000" down_thread="false" up_thread="false"
min_threshold="0.10"/>
- <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+ <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+
</config>
</attribute>
<!-- JGroups stack configuration to use for the control channel - used for control messages -->
-
+
<attribute name="ControlChannelConfig">
<config>
<UDP
mcast_addr="228.8.8.8"
- mcast_port="45568"
+ mcast_port="${jboss.messaging.controlchanneludpport:45568}"
tos="8"
ucast_recv_buf_size="20000000"
ucast_send_buf_size="640000"
@@ -250,7 +251,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: trunk/src/etc/server/default/deploy/sybase-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/sybase-persistence-service.xml 2007-10-28 17:33:10 UTC (rev 3254)
+++ trunk/src/etc/server/default/deploy/sybase-persistence-service.xml 2007-10-29 10:38:53 UTC (rev 3255)
@@ -166,7 +166,7 @@
<config>
<UDP
mcast_addr="228.8.8.8"
- mcast_port="45567"
+ mcast_port="${jboss.messaging.datachanneludpport:45567}"
tos="8"
ucast_recv_buf_size="20000000"
ucast_send_buf_size="640000"
@@ -198,24 +198,25 @@
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
down_thread="false" up_thread="false"
max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000"
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
down_thread="false" up_thread="false"
join_retry_timeout="2000" shun="false"
view_bundling="true"
view_ack_collection_timeout="5000"/>
<FC max_credits="2000000" down_thread="false" up_thread="false"
min_threshold="0.10"/>
- <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+ <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+
</config>
</attribute>
<!-- JGroups stack configuration to use for the control channel - used for control messages -->
-
+
<attribute name="ControlChannelConfig">
<config>
<UDP
mcast_addr="228.8.8.8"
- mcast_port="45568"
+ mcast_port="${jboss.messaging.controlchanneludpport:45568}"
tos="8"
ucast_recv_buf_size="20000000"
ucast_send_buf_size="640000"
@@ -255,7 +256,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: trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java 2007-10-28 17:33:10 UTC (rev 3254)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java 2007-10-29 10:38:53 UTC (rev 3255)
@@ -306,16 +306,6 @@
this.clustered = true;
- //Group name can be overridden with a system property - useful for Hudson test runs
- String s = System.getProperty("jboss.messaging.groupname");
-
- if (s != null)
- {
- log.debug("Group name overriden to use: " + s);
-
- groupName = s;
- }
-
groupMember = new GroupMember(groupName, stateTimeout, castTimeout, jChannelFactory, this, this);
this.supportsFailover = supportsFailover;
Modified: trunk/tests/build.properties
===================================================================
--- trunk/tests/build.properties 2007-10-28 17:33:10 UTC (rev 3254)
+++ trunk/tests/build.properties 2007-10-29 10:38:53 UTC (rev 3255)
@@ -2,5 +2,5 @@
# Local overrides for the builds initiated by build.sh
#
-test.bind.address=192.168.1.11
+#test.bind.address=192.168.1.2
Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml 2007-10-28 17:33:10 UTC (rev 3254)
+++ trunk/tests/build.xml 2007-10-29 10:38:53 UTC (rev 3255)
@@ -327,6 +327,8 @@
<sysproperty key="jgroups.bind_addr" value="${test.bind.address}"/>
<sysproperty key="test.bind.address" value="${test.bind.address}"/>
<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="test.database" value="${functional.tests.database}"/>
<sysproperty key="test.logfile.suffix" value="invm"/>
<sysproperty key="build.lib" value="${build.lib}"/>
@@ -727,6 +729,8 @@
<sysproperty key="module.output" value="${tests.output}"/>
<sysproperty key="test.bind.address" value="${test.bind.address}"/>
<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="jgroups.bind_addr" value="${test.bind.address}"/>
<sysproperty key="test.database" value="${clustering.tests.database}"/>
<sysproperty key="test.clustered" value="true"/>
Modified: trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java 2007-10-28 17:33:10 UTC (rev 3254)
+++ trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java 2007-10-29 10:38:53 UTC (rev 3255)
@@ -24,11 +24,11 @@
import java.util.ArrayList;
import java.util.List;
+import org.jboss.messaging.core.contract.ChannelFactory;
import org.jboss.messaging.core.contract.ClusterNotifier;
import org.jboss.messaging.core.contract.Condition;
import org.jboss.messaging.core.contract.ConditionFactory;
import org.jboss.messaging.core.contract.FilterFactory;
-import org.jboss.messaging.core.contract.ChannelFactory;
import org.jboss.messaging.core.contract.Message;
import org.jboss.messaging.core.contract.MessageReference;
import org.jboss.messaging.core.contract.MessageStore;
@@ -90,7 +90,7 @@
new ClusteredPersistenceServiceConfigFileJChannelFactory(configFilePath,
ignoreMultiplexer,
sc.getMBeanServer());
-
+
MessagingPostOffice postOffice =
new MessagingPostOffice(sc.getDataSource(), sc.getTransactionManager(),
sc.getPostOfficeSQLProperties(), true, nodeID,
@@ -157,16 +157,14 @@
return createNonClusteredPostOffice(sc, ms, tr, pm);
}
- protected PostOffice createClusteredPostOffice(int nodeID, String groupName,
- long stateTimeout, long castTimeout) throws Exception
- {
- return createClusteredPostOffice(nodeID, groupName, stateTimeout, castTimeout, sc, ms, tr, pm);
- }
-
- protected PostOffice createClusteredPostOffice(int nodeID, String groupName) throws Exception
+ protected PostOffice createClusteredPostOffice(int nodeID) throws Exception
{
+ //System property provides group name so we can run concurrently in QA lab
+ String groupName = System.getProperty("jboss.messaging.groupname");
+
log.info("Creating clusteredPostOffice node " + nodeID);
- return createClusteredPostOffice(nodeID, groupName, 5000, 5000, sc, ms, tr, pm);
+
+ return createClusteredPostOffice(nodeID, groupName == null ? "testgroup" : groupName, 5000, 5000, sc, ms, tr, pm);
}
protected List sendMessages(String conditionText, boolean persistent, PostOffice office, int num, Transaction tx) throws Exception
Modified: trunk/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPostOfficeTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPostOfficeTest.java 2007-10-28 17:33:10 UTC (rev 3254)
+++ trunk/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPostOfficeTest.java 2007-10-29 10:38:53 UTC (rev 3255)
@@ -77,11 +77,11 @@
try
{
- office1 = createClusteredPostOffice(1, "testgroup");
+ office1 = createClusteredPostOffice(1);
- office2 = createClusteredPostOffice(2, "testgroup");
+ office2 = createClusteredPostOffice(2);
- office3 = createClusteredPostOffice(3, "testgroup");
+ office3 = createClusteredPostOffice(3);
Thread.sleep(1000);
@@ -137,11 +137,11 @@
try
{
- office1 = createClusteredPostOffice(1, "testgroup");
+ office1 = createClusteredPostOffice(1);
- office2 = createClusteredPostOffice(2, "testgroup");
+ office2 = createClusteredPostOffice(2);
- office3 = createClusteredPostOffice(3, "testgroup");
+ office3 = createClusteredPostOffice(3);
Thread.sleep(1000);
@@ -194,7 +194,7 @@
{
// Start one office
- office1 = createClusteredPostOffice(1, "testgroup");
+ office1 = createClusteredPostOffice(1);
// Add a couple of queues
@@ -214,7 +214,7 @@
// Start another office - make sure it picks up the bindings from the first node
- office2 = createClusteredPostOffice(2, "testgroup");
+ office2 = createClusteredPostOffice(2);
// Should return all queues
Collection queues = office2.getQueuesForCondition(condition1, false);
@@ -299,7 +299,7 @@
// Add a third office
- office3 = createClusteredPostOffice(3, "testgroup");
+ office3 = createClusteredPostOffice(3);
// Maks sure it picks up the bindings
@@ -629,9 +629,9 @@
try
{
- office1 = createClusteredPostOffice(1, "testgroup");
- office2 = createClusteredPostOffice(2, "testgroup");
- office3 = createClusteredPostOffice(3, "testgroup");
+ office1 = createClusteredPostOffice(1);
+ office2 = createClusteredPostOffice(2);
+ office3 = createClusteredPostOffice(3);
//Durable
Queue queue1 = new MessagingQueue(1, "sub1", channelIDManager.getID(), ms, pm, true, -1, null, true);
@@ -786,9 +786,9 @@
try
{
- office1 = createClusteredPostOffice(1, "testgroup");
- office2 = createClusteredPostOffice(2, "testgroup");
- office3 = createClusteredPostOffice(3, "testgroup");
+ office1 = createClusteredPostOffice(1);
+ office2 = createClusteredPostOffice(2);
+ office3 = createClusteredPostOffice(3);
//Durable
Queue queue1 = new MessagingQueue(1, "sub1", channelIDManager.getID(), ms, pm, true, -1, null, true);
@@ -897,7 +897,7 @@
try
{
- office1 = createClusteredPostOffice(1, "testgroup");
+ office1 = createClusteredPostOffice(1);
//Durable
Queue queue1 = new MessagingQueue(1, "sub1", channelIDManager.getID(), ms, pm, true, -1, null, true);
@@ -911,8 +911,8 @@
Thread.sleep(1000);
- office2 = createClusteredPostOffice(2, "testgroup");
- office3 = createClusteredPostOffice(3, "testgroup");
+ office2 = createClusteredPostOffice(2);
+ office3 = createClusteredPostOffice(3);
Thread.sleep(1000);
@@ -994,7 +994,7 @@
try
{
- office1 = createClusteredPostOffice(1, "testgroup");
+ office1 = createClusteredPostOffice(1);
//Durable
Queue queue1 = new MessagingQueue(1, "sub1", channelIDManager.getID(), ms, pm, true, -1, null, true);
@@ -1012,8 +1012,8 @@
//office1 = createClusteredPostOffice(1, "testgroup");
office1.start();
- office2 = createClusteredPostOffice(2, "testgroup");
- office3 = createClusteredPostOffice(3, "testgroup");
+ office2 = createClusteredPostOffice(2);
+ office3 = createClusteredPostOffice(3);
Thread.sleep(1000);
@@ -1097,7 +1097,7 @@
try
{
- office1 = createClusteredPostOffice(1, "testgroup");
+ office1 = createClusteredPostOffice(1);
//Durable
Queue queue1 = new MessagingQueue(1, "sub1", channelIDManager.getID(), ms, pm, true, -1, null, true);
@@ -1113,8 +1113,8 @@
office1.stop();
- office2 = createClusteredPostOffice(2, "testgroup");
- office3 = createClusteredPostOffice(3, "testgroup");
+ office2 = createClusteredPostOffice(2);
+ office3 = createClusteredPostOffice(3);
Collection bindings = office2.getAllBindings();
assertTrue(bindings.isEmpty());
@@ -1209,9 +1209,9 @@
try
{
- office1 = createClusteredPostOffice(1, "testgroup");
- office2 = createClusteredPostOffice(2, "testgroup");
- office3 = createClusteredPostOffice(3, "testgroup");
+ office1 = createClusteredPostOffice(1);
+ office2 = createClusteredPostOffice(2);
+ office3 = createClusteredPostOffice(3);
//Durable
Queue queue1 = new MessagingQueue(1, "sub1", channelIDManager.getID(), ms, pm, false, -1, null, true);
@@ -1391,7 +1391,7 @@
try
{
- office1 = createClusteredPostOffice(1, "testgroup");
+ office1 = createClusteredPostOffice(1);
Queue queue1 = new MessagingQueue(1, "queue1", channelIDManager.getID(), ms, pm, true, -1, null, true);
queue1.activate();
@@ -1531,9 +1531,9 @@
try
{
- office1 = createClusteredPostOffice(1, "testgroup");
+ office1 = createClusteredPostOffice(1);
- office2 = createClusteredPostOffice(2, "testgroup");
+ office2 = createClusteredPostOffice(2);
Queue queue1 = new MessagingQueue(1, "queue1", channelIDManager.getID(), ms, pm, false, -1, null, true);
queue1.activate();
@@ -1611,8 +1611,8 @@
{
//Start two offices
- office1 = createClusteredPostOffice(1, "testgroup");
- office2 = createClusteredPostOffice(2, "testgroup");
+ office1 = createClusteredPostOffice(1);
+ office2 = createClusteredPostOffice(2);
Queue[] queues = new Queue[16];
@@ -1955,8 +1955,8 @@
try
{
- office1 = createClusteredPostOffice(1, "testgroup");
- office2 = createClusteredPostOffice(2, "testgroup");
+ office1 = createClusteredPostOffice(1);
+ office2 = createClusteredPostOffice(2);
SimpleFilter filter1 = new SimpleFilter(2);
SimpleFilter filter2 = new SimpleFilter(3);
@@ -2067,10 +2067,10 @@
try
{
- office1 = createClusteredPostOffice(1, "testgroup");
- office2 = createClusteredPostOffice(2, "testgroup");
- office3 = createClusteredPostOffice(3, "testgroup");
- office4 = createClusteredPostOffice(4, "testgroup");
+ office1 = createClusteredPostOffice(1);
+ office2 = createClusteredPostOffice(2);
+ office3 = createClusteredPostOffice(3);
+ office4 = createClusteredPostOffice(4);
Queue queue1 = new MessagingQueue(1, "queue1", channelIDManager.getID(), ms, pm, false, -1, null, true);
queue1.activate();
@@ -2224,8 +2224,8 @@
try
{
- office1 = createClusteredPostOffice(1, "testgroup");
- office2 = createClusteredPostOffice(2, "testgroup");
+ office1 = createClusteredPostOffice(1);
+ office2 = createClusteredPostOffice(2);
//A mixture of durable and non durable queues
@@ -2429,8 +2429,8 @@
try
{
- office1 = createClusteredPostOffice(1, "testgroup");
- office2 = createClusteredPostOffice(2, "testgroup");
+ office1 = createClusteredPostOffice(1);
+ office2 = createClusteredPostOffice(2);
Queue[] queues = new Queue[16];
@@ -2629,8 +2629,8 @@
try
{
- office1 = createClusteredPostOffice(1, "testgroup");
- office2 = createClusteredPostOffice(2, "testgroup");
+ office1 = createClusteredPostOffice(1);
+ office2 = createClusteredPostOffice(2);
//queue1
@@ -2775,8 +2775,8 @@
try
{
- office1 = createClusteredPostOffice(1, "testgroup");
- office2 = createClusteredPostOffice(2, "testgroup");
+ office1 = createClusteredPostOffice(1);
+ office2 = createClusteredPostOffice(2);
Queue queue0 = new MessagingQueue(1, "sub1", channelIDManager.getID(), ms, pm, false, -1, null, true);
Modified: trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2007-10-28 17:33:10 UTC (rev 3254)
+++ trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2007-10-29 10:38:53 UTC (rev 3255)
@@ -441,6 +441,18 @@
sb.append("-Djboss.messaging.groupname=").append(groupName).append(' ');
}
+ String dataChannelUDPPort = System.getProperty("jboss.messaging.datachanneludpport");
+ if (dataChannelUDPPort != null)
+ {
+ sb.append("-Djboss.messaging.datachanneludpport=").append(dataChannelUDPPort).append(' ');
+ }
+
+ String controlChannelUDPPort = System.getProperty("jboss.messaging.controlchanneludpport");
+ if (controlChannelUDPPort != null)
+ {
+ sb.append("-Djboss.messaging.controlchanneludpport=").append(controlChannelUDPPort).append(' ');
+ }
+
String testLogfileSuffix = System.getProperty("test.logfile.suffix");
if (testLogfileSuffix == null)
More information about the jboss-cvs-commits
mailing list