[jboss-cvs] JBoss Messaging SVN: r6602 - in trunk: src/schemas and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 28 12:07:26 EDT 2009
Author: jmesnil
Date: 2009-04-28 12:07:25 -0400 (Tue, 28 Apr 2009)
New Revision: 6602
Modified:
trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
trunk/src/schemas/jbm-configuration.xsd
trunk/tests/config/ConfigurationTest-full-config.xml
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java
Log:
JBMESSSAGING-1574: Uncomment and fix FileConfigurationTest
* test all configuration parameters
* fixed typo in XML + XSD
* fixed missing parsing of parameters
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2009-04-28 15:55:37 UTC (rev 6601)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2009-04-28 16:07:25 UTC (rev 6602)
@@ -585,10 +585,18 @@
{
retryInterval = XMLUtil.parseLong(child);
}
+ else if (child.getNodeName().equals("max-hops"))
+ {
+ maxHops = XMLUtil.parseInt(child);
+ }
else if (child.getNodeName().equals("use-duplicate-detection"))
{
duplicateDetection = org.jboss.messaging.utils.XMLUtil.parseBoolean(child);
}
+ else if (child.getNodeName().equals("forward-when-no-consumers"))
+ {
+ forwardWhenNoConsumers = org.jboss.messaging.utils.XMLUtil.parseBoolean(child);
+ }
else if (child.getNodeName().equals("discovery-group-ref"))
{
discoveryGroupName = child.getAttributes().getNamedItem("discovery-group-name").getNodeValue();
Modified: trunk/src/schemas/jbm-configuration.xsd
===================================================================
--- trunk/src/schemas/jbm-configuration.xsd 2009-04-28 15:55:37 UTC (rev 6601)
+++ trunk/src/schemas/jbm-configuration.xsd 2009-04-28 16:07:25 UTC (rev 6602)
@@ -397,7 +397,7 @@
<xsd:element name="connector-ref"
type="connector-refType" minOccurs="1" maxOccurs="1">
</xsd:element>
- <xsd:element name="disccovery-group-ref" minOccurs="1"
+ <xsd:element name="discovery-group-ref" minOccurs="1"
maxOccurs="1">
<xsd:complexType>
<xsd:attribute name="discovery-group-name"
Modified: trunk/tests/config/ConfigurationTest-full-config.xml
===================================================================
--- trunk/tests/config/ConfigurationTest-full-config.xml 2009-04-28 15:55:37 UTC (rev 6601)
+++ trunk/tests/config/ConfigurationTest-full-config.xml 2009-04-28 16:07:25 UTC (rev 6602)
@@ -8,8 +8,12 @@
<wild-card-routing-enabled>true</wild-card-routing-enabled>
<management-address>Giraffe</management-address>
<management-notification-address>Whatever</management-notification-address>
+ <management-request-timeout>91</management-request-timeout>
+ <management-cluster-password>Wombat</management-cluster-password>
<jmx-management-enabled>false</jmx-management-enabled>
<message-counter-enabled>true</message-counter-enabled>
+ <message-counter-max-day-history>5</message-counter-max-day-history>
+ <message-counter-sample-period>123456</message-counter-sample-period>
<connection-scan-period>6543</connection-scan-period>
<connection-ttl-override>12345</connection-ttl-override>
<transaction-timeout>98765</transaction-timeout>
@@ -18,58 +22,69 @@
<message-expiry-thread-priority>8</message-expiry-thread-priority>
<id-cache-size>127</id-cache-size>
<persist-id-cache>true</persist-id-cache>
+ <queue-activation-timeout>12456</queue-activation-timeout>
+ <backup>true</backup>
+ <persist-delivery-count-before-delivery>true</persist-delivery-count-before-delivery>
+ <paging-max-threads>2</paging-max-threads>
+ <paging-directory>pagingdir</paging-directory>
+ <paging-global-watermark-size>123</paging-global-watermark-size>
+ <paging-max-global-size-bytes>4567</paging-max-global-size-bytes>
+ <bindings-directory>somedir</bindings-directory>
+ <create-bindings-dir>false</create-bindings-dir>
+ <journal-directory>somedir2</journal-directory>
+ <create-journal-dir>false</create-journal-dir>
+ <journal-type>NIO</journal-type>
+ <journal-buffer-reuse-size>128</journal-buffer-reuse-size>
+ <journal-sync-transactional>false</journal-sync-transactional>
+ <journal-sync-non-transactional>true</journal-sync-non-transactional>
+ <journal-file-size>12345678</journal-file-size>
+ <journal-min-files>100</journal-min-files>
+ <journal-max-aio>56546</journal-max-aio>
+ <large-messages-directory>largemessagesdir</large-messages-directory>
+
<remoting-interceptors>
<class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1</class-name>
<class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor2</class-name>
</remoting-interceptors>
- <queue-activation-timeout>12456</queue-activation-timeout>
- <backup>true</backup>
- <persist-delivery-count-before-delivery>true</persist-delivery-count-before-delivery>
+
<backup-connector-ref connector-name="backup-connector" />
<connectors>
- <connector name="connector">
+ <connector name="connector1">
<factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
- <param key="d_mykey1" value="d_foovalue1" type="String"/>
- <param key="d_mykey2" value="6000" type="Long"/>
- <param key="d_mykey3" value="60" type="Integer"/>
- <param key="d_mykey4" value="d_foovalue4" type="String"/>
+ <param key="a1" value="v1" type="String"/>
+ <param key="a2" value="123" type="Long"/>
+ <param key="a3" value="345" type="Integer"/>
+ <param key="a4" value="v4" type="String"/>
</connector>
- <connector name="connector1">
+ <connector name="connector2">
<factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestConnectorFactory2</factory-class>
- <param key="d_mykey1" value="d_foovalue1" type="String"/>
- <param key="d_mykey2" value="6000" type="Long"/>
- <param key="d_mykey3" value="60" type="Integer"/>
- <param key="d_mykey4" value="d_foovalue4" type="String"/>
+ <param key="b1" value="w1" type="String"/>
+ <param key="b2" value="234" type="Long"/>
+ <param key="b3" value="456" type="Integer"/>
+ <param key="b4" value="w4" type="String"/>
</connector>
- <connector name="connector2">
+ <connector name="backup-connector">
<factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestConnectorFactory3</factory-class>
- <param key="d_mykey1" value="d_foovalue1" type="String"/>
- <param key="d_mykey2" value="6000" type="Long"/>
- <param key="d_mykey3" value="60" type="Integer"/>
- <param key="d_mykey4" value="d_foovalue4" type="String"/>
+ <param key="c1" value="x1" type="String"/>
+ <param key="c2" value="345" type="Long"/>
+ <param key="c3" value="567" type="Integer"/>
+ <param key="c4" value="x4" type="String"/>
</connector>
- <connector name="backup-connector">
- <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
- <param key="c_mykey1" value="c_foovalue1" type="String"/>
- <param key="c_mykey2" value="6000" type="Long"/>
- <param key="c_mykey3" value="60" type="Integer"/>
- <param key="c_mykey4" value="c_foovalue4" type="String"/>
- </connector>
</connectors>
<acceptors>
<acceptor name="acceptor1">
<factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
- <param key="a_mykey1" value="a_foovalue1" type="String"/>
- <param key="a_mykey2" value="1234567" type="Long"/>
- <param key="a_mykey3" value="123" type="Integer"/>
- <param key="a_mykey4" value="a_foovalue4" type="String"/>
+ <param key="d1" value="y1" type="String"/>
+ <param key="d2" value="456" type="Long"/>
+ <param key="d3" value="678" type="Integer"/>
+ <param key="d4" value="y4" type="String"/>
</acceptor>
<acceptor name="acceptor2">
<factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
- <param key="b_mykey1" value="b_foovalue1" type="String"/>
- <param key="b_mykey2" value="7654321" type="Long"/>
- <param key="b_mykey3" value="321" type="Integer"/>
- <param key="b_mykey4" value="b_foovalue4" type="String"/>
+ <param key="e1" value="z1" type="String"/>
+ <param key="e2" value="567" type="Long"/>
+ <param key="e3" value="789" type="Integer"/>
+ <param key="e4" value="z4" type="String"/>
</acceptor>
</acceptors>
<broadcast-groups>
@@ -78,33 +93,33 @@
<group-address>192.168.0.120</group-address>
<group-port>11999</group-port>
<broadcast-period>12345</broadcast-period>
- <connector-ref connector-name="connector"/>
+ <connector-ref connector-name="connector1"/>
</broadcast-group>
<broadcast-group name="bg2">
- <local-bind-port>10999</local-bind-port>
- <group-address>192.168.0.120</group-address>
- <group-port>11999</group-port>
- <broadcast-period>12345</broadcast-period>
- <connector-ref connector-name="connector"/>
+ <local-bind-port>12999</local-bind-port>
+ <group-address>192.168.0.121</group-address>
+ <group-port>13999</group-port>
+ <broadcast-period>23456</broadcast-period>
+ <connector-ref connector-name="connector2" backup-connector-name="backup-connector"/>
</broadcast-group>
</broadcast-groups>
<discovery-groups>
<discovery-group name="dg1">
- <group-address>192.168.0.121</group-address>
+ <group-address>192.168.0.120</group-address>
<group-port>11999</group-port>
<refresh-timeout>12345</refresh-timeout>
</discovery-group>
<discovery-group name="dg2">
<group-address>192.168.0.121</group-address>
- <group-port>11999</group-port>
- <refresh-timeout>12345</refresh-timeout>
+ <group-port>12999</group-port>
+ <refresh-timeout>23456</refresh-timeout>
</discovery-group>
</discovery-groups>
<diverts>
<divert name="divert1">
<routing-name>routing-name1</routing-name>
<address>address1</address>
- <forwarding-address>forwarding-addres1</forwarding-address>
+ <forwarding-address>forwarding-address1</forwarding-address>
<filter string="speed > 88"/>
<transformer-class-name>org.foo.Transformer</transformer-class-name>
<exclusive>true</exclusive>
@@ -112,28 +127,28 @@
<divert name="divert2">
<routing-name>routing-name2</routing-name>
<address>address2</address>
- <forwarding-address>forwarding-addres2</forwarding-address>
- <filter string="speed > 88"/>
- <transformer-class-name>org.foo.Transformer</transformer-class-name>
+ <forwarding-address>forwarding-address2</forwarding-address>
+ <filter string="speed < 88"/>
+ <transformer-class-name>org.foo.Transformer2</transformer-class-name>
<exclusive>false</exclusive>
</divert>
</diverts>
<queues>
- <queue name="foo">
- <address>bar</address>
+ <queue name="queue1">
+ <address>address1</address>
<filter string="color='red'" />
<durable>false</durable>
</queue>
- <queue name="foo2">
- <address>bar2</address>
- <filter string="color='red'" />
+ <queue name="queue2">
+ <address>address2</address>
+ <filter string="color='blue'" />
<durable>false</durable>
</queue>
</queues>
<bridges>
- <bridge name="bridge">
- <queue-name>foo</queue-name>
- <forwarding-address>bridge-forwarding-address</forwarding-address>
+ <bridge name="bridge1">
+ <queue-name>queue1</queue-name>
+ <forwarding-address>bridge-forwarding-address1</forwarding-address>
<filter string="sku > 1"/>
<transformer-class-name>org.foo.BridgeTransformer</transformer-class-name>
<retry-interval>3</retry-interval>
@@ -141,51 +156,33 @@
<reconnect-attempts>2</reconnect-attempts>
<failover-on-server-shutdown>false</failover-on-server-shutdown>
<use-duplicate-detection>true</use-duplicate-detection>
- <connector-ref connector-name="connector"/>
+ <connector-ref connector-name="connector1"/>
</bridge>
<bridge name="bridge2">
- <queue-name>foo2</queue-name>
- <forwarding-address>bridge-forwarding-address</forwarding-address>
- <filter string="sku > 1"/>
- <disccovery-group-ref discovery-group-name="dg1"/>
+ <queue-name>queue2</queue-name>
+ <forwarding-address>bridge-forwarding-address2</forwarding-address>
+ <discovery-group-ref discovery-group-name="dg1"/>
</bridge>
</bridges>
<cluster-connections>
<cluster-connection name="cluster-connection1">
- <address>queues</address>
+ <address>queues1</address>
<retry-interval>3</retry-interval>
<use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>true</forward-when-no-consumers>
+ <forward-when-no-consumers>false</forward-when-no-consumers>
<max-hops>1</max-hops>
- <connector-ref connector-name="connector"/>
- <connector-ref connector-name="connector1"/>
+ <connector-ref connector-name="connector1" backup-connector-name="backup-connector"/>
<connector-ref connector-name="connector2"/>
</cluster-connection>
<cluster-connection name="cluster-connection2">
<address>queues2</address>
- <retry-interval>3</retry-interval>
- <use-duplicate-detection>true</use-duplicate-detection>
+ <retry-interval>4</retry-interval>
+ <use-duplicate-detection>false</use-duplicate-detection>
<forward-when-no-consumers>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
+ <max-hops>2</max-hops>
<discovery-group-ref discovery-group-name="dg1"/>
</cluster-connection>
</cluster-connections>
- <paging-max-threads>2</paging-max-threads>
- <paging-directory>pagingdir</paging-directory>
- <paging-global-watermark-size>123</paging-global-watermark-size>
- <paging-max-global-size-bytes>4567</paging-max-global-size-bytes>
- <bindings-directory>somedir</bindings-directory>
- <create-bindings-dir>false</create-bindings-dir>
- <journal-directory>somedir2</journal-directory>
- <create-journal-dir>false</create-journal-dir>
- <journal-type>NIO</journal-type>
- <journal-buffer-reuse-size>128</journal-buffer-reuse-size>
- <journal-sync-transactional>false</journal-sync-transactional>
- <journal-sync-non-transactional>true</journal-sync-non-transactional>
- <journal-file-size>12345678</journal-file-size>
- <journal-min-files>100</journal-min-files>
- <journal-max-aio>56546</journal-max-aio>
- <large-messages-directory>largemessagesdir</large-messages-directory>
</configuration>
<settings>
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java 2009-04-28 15:55:37 UTC (rev 6601)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java 2009-04-28 16:07:25 UTC (rev 6602)
@@ -23,7 +23,14 @@
package org.jboss.messaging.tests.unit.core.config.impl;
import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.config.TransportConfiguration;
+import org.jboss.messaging.core.config.cluster.BridgeConfiguration;
+import org.jboss.messaging.core.config.cluster.BroadcastGroupConfiguration;
+import org.jboss.messaging.core.config.cluster.ClusterConnectionConfiguration;
+import org.jboss.messaging.core.config.cluster.DiscoveryGroupConfiguration;
+import org.jboss.messaging.core.config.cluster.DivertConfiguration;
import org.jboss.messaging.core.config.impl.FileConfiguration;
+import org.jboss.messaging.core.server.JournalType;
import org.jboss.messaging.utils.SimpleString;
/**
@@ -32,159 +39,269 @@
*/
public class FileConfigurationTest extends ConfigurationImplTest
{
+ @Override
public void testDefaults()
{
//Check they match the values from the test file
assertEquals(true, conf.isClustered());
- assertEquals(true, conf.isBackup());
- assertEquals(12456, conf.getQueueActivationTimeout());
- assertEquals(12345, conf.getScheduledThreadPoolMaxSize());
+ assertEquals(true, conf.isEnableFileDeployment());
+ assertEquals(12345, conf.getScheduledThreadPoolMaxSize());
+ assertEquals(false, conf.isSecurityEnabled());
assertEquals(5423, conf.getSecurityInvalidationInterval());
- assertEquals(false, conf.isSecurityEnabled());
+ assertEquals(true, conf.isWildcardRoutingEnabled());
+ assertEquals(new SimpleString("Giraffe"), conf.getManagementAddress());
+ assertEquals(91, conf.getManagementRequestTimeout());
+ assertEquals(new SimpleString("Whatever"), conf.getManagementNotificationAddress());
+ assertEquals("Wombat", conf.getManagementClusterPassword());
+ assertEquals(false, conf.isJMXManagementEnabled());
+ assertEquals(true, conf.isMessageCounterEnabled());
+ assertEquals(5, conf.getMessageCounterMaxDayHistory());
+ assertEquals(123456, conf.getMessageCounterSamplePeriod());
assertEquals(6543, conf.getConnectionScanPeriod());
+ assertEquals(12345, conf.getConnectionTTLOverride());
+ assertEquals(98765, conf.getTransactionTimeout());
+ assertEquals(56789, conf.getTransactionTimeoutScanPeriod());
+ assertEquals(10111213, conf.getMessageExpiryScanPeriod());
+ assertEquals(8, conf.getMessageExpiryThreadPriority());
+ assertEquals(127, conf.getIDCacheSize());
+ assertEquals(true, conf.isPersistIDCache());
+ assertEquals(12456, conf.getQueueActivationTimeout());
+ assertEquals(true, conf.isBackup());
+ assertEquals(true, conf.isPersistDeliveryCountBeforeDelivery());
+ assertEquals(2, conf.getPagingMaxThreads());
+ assertEquals("pagingdir", conf.getPagingDirectory());
+ assertEquals(123, conf.getPagingGlobalWatermarkSize());
+ assertEquals(4567, conf.getPagingMaxGlobalSizeBytes());
assertEquals("somedir", conf.getBindingsDirectory());
assertEquals(false, conf.isCreateBindingsDir());
assertEquals("somedir2", conf.getJournalDirectory());
assertEquals(false, conf.isCreateJournalDir());
- assertEquals("NIO", conf.getJournalType().toString());
+ assertEquals(JournalType.NIO, conf.getJournalType());
+ assertEquals(128, conf.getJournalBufferReuseSize());
assertEquals(false, conf.isJournalSyncTransactional());
assertEquals(true, conf.isJournalSyncNonTransactional());
assertEquals(12345678, conf.getJournalFileSize());
assertEquals(100, conf.getJournalMinFiles());
assertEquals(56546, conf.getJournalMaxAIO());
- assertEquals(true, conf.isWildcardRoutingEnabled());
- assertEquals(98765, conf.getTransactionTimeout());
- assertEquals(56789, conf.getTransactionTimeoutScanPeriod());
- assertEquals(10111213, conf.getMessageExpiryScanPeriod());
- assertEquals(8, conf.getMessageExpiryThreadPriority());
- assertEquals(new SimpleString("Giraffe"), conf.getManagementAddress());
- assertEquals(91, conf.getManagementRequestTimeout());
+ assertEquals("largemessagesdir", conf.getLargeMessagesDirectory());
+
assertEquals(2, conf.getInterceptorClassNames().size());
assertTrue(conf.getInterceptorClassNames().contains("org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1"));
assertTrue(conf.getInterceptorClassNames().contains("org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor2"));
- assertNotNull(conf.getBackupConnectorName());
+ assertEquals("backup-connector", conf.getBackupConnectorName());
+
+ assertEquals(3, conf.getConnectorConfigurations().size());
- assertEquals(true, conf.isMessageCounterEnabled());
- assertEquals(5678, conf.getMessageCounterSamplePeriod());
- assertEquals(78910, conf.getMessageCounterMaxDayHistory());
- //TODO - sort this out
+ TransportConfiguration tc = conf.getConnectorConfigurations().get("connector1");
+ assertNotNull(tc);
+ assertEquals("org.jboss.messaging.tests.unit.core.config.impl.TestConnectorFactory1", tc.getFactoryClassName());
+ Object param = tc.getParams().get("a1");
+ assertTrue(param instanceof String);
+ assertEquals("v1", param);
+ param = tc.getParams().get("a2");
+ assertTrue(param instanceof Long);
+ assertEquals(123, ((Long)param).longValue());
+ param = tc.getParams().get("a3");
+ assertTrue(param instanceof Integer);
+ assertEquals(345, param);
+ param = tc.getParams().get("a4");
+ assertTrue(param instanceof String);
+ assertEquals("v4", param);
-// assertEquals("org.jboss.messaging.tests.unit.core.config.impl.TestConnectorFactory1", conf.getBackupConnectorConfiguration().getFactoryClassName());
-// Map<String, Object> params = conf.getBackupConnectorConfiguration().getParams();
-// assertNotNull(params);
-// Object obj = params.get("c_mykey1");
-// assertNotNull(obj);
-// assertTrue(obj instanceof String);
-// {
-// String s = (String)obj;
-// assertEquals("c_foovalue1", s);
-// }
-//
-// obj = params.get("c_mykey2");
-// assertNotNull(obj);
-// assertTrue(obj instanceof Long);
-// {
-// Long l = (Long)obj;
-// assertEquals(6000l, l.longValue());
-// }
-//
-// obj = params.get("c_mykey3");
-// assertNotNull(obj);
-// assertTrue(obj instanceof Integer);
-// {
-// Integer i = (Integer)obj;
-// assertEquals(60, i.intValue());
-// }
-//
-// obj = params.get("c_mykey4");
-// assertNotNull(obj);
-// assertTrue(obj instanceof String);
-// {
-// String s = (String)obj;
-// assertEquals("c_foovalue4", s);
-// }
-//
-// assertEquals(2, conf.getAcceptorConfigurations().size());
-// for (TransportConfiguration info: conf.getAcceptorConfigurations())
-// {
-// if (info.getFactoryClassName().equals("org.jboss.messaging.tests.unit.core.config.impl.TestAcceptorFactory1"))
-// {
-// params = info.getParams();
-//
-// obj = params.get("a_mykey1");
-// assertNotNull(obj);
-// assertTrue(obj instanceof String);
-// {
-// String s = (String)obj;
-// assertEquals("a_foovalue1", s);
-// }
-//
-// obj = params.get("a_mykey2");
-// assertNotNull(obj);
-// assertTrue(obj instanceof Long);
-// {
-// Long l = (Long)obj;
-// assertEquals(1234567l, l.longValue());
-// }
-//
-// obj = params.get("a_mykey3");
-// assertNotNull(obj);
-// assertTrue(obj instanceof Integer);
-// {
-// Integer i = (Integer)obj;
-// assertEquals(123, i.intValue());
-// }
-//
-// obj = params.get("a_mykey4");
-// assertNotNull(obj);
-// assertTrue(obj instanceof String);
-// {
-// String s = (String)obj;
-// assertEquals("a_foovalue4", s);
-// }
-// }
-// else if (info.getFactoryClassName().equals("org.jboss.messaging.tests.unit.core.config.impl.TestAcceptorFactory2"))
-// {
-// params = info.getParams();
-//
-// obj = params.get("b_mykey1");
-// assertNotNull(obj);
-// assertTrue(obj instanceof String);
-// {
-// String s = (String)obj;
-// assertEquals("b_foovalue1", s);
-// }
-//
-// obj = params.get("b_mykey2");
-// assertNotNull(obj);
-// assertTrue(obj instanceof Long);
-// {
-// Long l = (Long)obj;
-// assertEquals(7654321l, l.longValue());
-// }
-//
-// obj = params.get("b_mykey3");
-// assertNotNull(obj);
-// assertTrue(obj instanceof Integer);
-// {
-// Integer i = (Integer)obj;
-// assertEquals(321, i.intValue());
-// }
-//
-// obj = params.get("b_mykey4");
-// assertNotNull(obj);
-// assertTrue(obj instanceof String);
-// {
-// String s = (String)obj;
-// assertEquals("b_foovalue4", s);
-// }
-// }
-// else
-// {
-// fail("Invalid factory class");
-// }
-// }
+ tc = conf.getConnectorConfigurations().get("connector2");
+ assertNotNull(tc);
+ assertEquals("org.jboss.messaging.tests.unit.core.config.impl.TestConnectorFactory2", tc.getFactoryClassName());
+ param = tc.getParams().get("b1");
+ assertTrue(param instanceof String);
+ assertEquals("w1", param);
+ param = tc.getParams().get("b2");
+ assertTrue(param instanceof Long);
+ assertEquals(234, ((Long)param).longValue());
+ param = tc.getParams().get("b3");
+ assertTrue(param instanceof Integer);
+ assertEquals(456, param);
+ param = tc.getParams().get("b4");
+ assertTrue(param instanceof String);
+ assertEquals("w4", param);
+
+ tc = conf.getConnectorConfigurations().get("backup-connector");
+ assertNotNull(tc);
+ assertEquals("org.jboss.messaging.tests.unit.core.config.impl.TestConnectorFactory3", tc.getFactoryClassName());
+ param = tc.getParams().get("c1");
+ assertTrue(param instanceof String);
+ assertEquals("x1", param);
+ param = tc.getParams().get("c2");
+ assertTrue(param instanceof Long);
+ assertEquals(345, ((Long)param).longValue());
+ param = tc.getParams().get("c3");
+ assertTrue(param instanceof Integer);
+ assertEquals(567, param);
+ param = tc.getParams().get("c4");
+ assertTrue(param instanceof String);
+ assertEquals("x4", param);
+
+ assertEquals(2, conf.getAcceptorConfigurations().size());
+ for (TransportConfiguration ac: conf.getAcceptorConfigurations())
+ {
+ if (ac.getFactoryClassName().equals("org.jboss.messaging.tests.unit.core.config.impl.TestAcceptorFactory1"))
+ {
+ assertEquals("org.jboss.messaging.tests.unit.core.config.impl.TestAcceptorFactory1", ac.getFactoryClassName());
+ param = ac.getParams().get("d1");
+ assertTrue(param instanceof String);
+ assertEquals("y1", param);
+ param = ac.getParams().get("d2");
+ assertTrue(param instanceof Long);
+ assertEquals(456, ((Long)param).longValue());
+ param = ac.getParams().get("d3");
+ assertTrue(param instanceof Integer);
+ assertEquals(678, param);
+ param = ac.getParams().get("d4");
+ assertTrue(param instanceof String);
+ assertEquals("y4", param);
+ }
+ else
+ {
+ assertEquals("org.jboss.messaging.tests.unit.core.config.impl.TestAcceptorFactory2", ac.getFactoryClassName());
+ param = ac.getParams().get("e1");
+ assertTrue(param instanceof String);
+ assertEquals("z1", param);
+ param = ac.getParams().get("e2");
+ assertTrue(param instanceof Long);
+ assertEquals(567, ((Long)param).longValue());
+ param = ac.getParams().get("e3");
+ assertTrue(param instanceof Integer);
+ assertEquals(789, param);
+ param = ac.getParams().get("e4");
+ assertTrue(param instanceof String);
+ assertEquals("z4", param);
+ }
+ }
+
+ assertEquals(2, conf.getBroadcastGroupConfigurations().size());
+ for (BroadcastGroupConfiguration bc : conf.getBroadcastGroupConfigurations())
+ {
+ if (bc.getName().equals("bg1"))
+ {
+ assertEquals("bg1", bc.getName());
+ assertEquals(10999, bc.getLocalBindPort());
+ assertEquals("192.168.0.120", bc.getGroupAddress());
+ assertEquals(11999, bc.getGroupPort());
+ assertEquals(12345, bc.getBroadcastPeriod());
+ assertEquals("connector1", bc.getConnectorInfos().get(0).a);
+ assertEquals(null, bc.getConnectorInfos().get(0).b);
+ }
+ else
+ {
+ assertEquals("bg2", bc.getName());
+ assertEquals(12999, bc.getLocalBindPort());
+ assertEquals("192.168.0.121", bc.getGroupAddress());
+ assertEquals(13999, bc.getGroupPort());
+ assertEquals(23456, bc.getBroadcastPeriod());
+ assertEquals("connector2", bc.getConnectorInfos().get(0).a);
+ assertEquals("backup-connector", bc.getConnectorInfos().get(0).b);
+ }
+ }
+
+ assertEquals(2, conf.getDiscoveryGroupConfigurations().size());
+ DiscoveryGroupConfiguration dc = conf.getDiscoveryGroupConfigurations().get("dg1");
+ assertEquals("dg1", dc.getName());
+ assertEquals("192.168.0.120", dc.getGroupAddress());
+ assertEquals(11999, dc.getGroupPort());
+ assertEquals(12345, dc.getRefreshTimeout());
+
+ dc = conf.getDiscoveryGroupConfigurations().get("dg2");
+ assertEquals("dg2", dc.getName());
+ assertEquals("192.168.0.121", dc.getGroupAddress());
+ assertEquals(12999, dc.getGroupPort());
+ assertEquals(23456, dc.getRefreshTimeout());
+
+ assertEquals(2, conf.getDivertConfigurations().size());
+ for (DivertConfiguration dic : conf.getDivertConfigurations())
+ {
+ if (dic.getName().equals("divert1"))
+ {
+ assertEquals("divert1", dic.getName());
+ assertEquals("routing-name1", dic.getRoutingName());
+ assertEquals("address1", dic.getAddress());
+ assertEquals("forwarding-address1", dic.getForwardingAddress());
+ assertEquals("speed > 88", dic.getFilterString());
+ assertEquals("org.foo.Transformer", dic.getTransformerClassName());
+ assertEquals(true, dic.isExclusive());
+ }
+ else
+ {
+ assertEquals("divert2", dic.getName());
+ assertEquals("routing-name2", dic.getRoutingName());
+ assertEquals("address2", dic.getAddress());
+ assertEquals("forwarding-address2", dic.getForwardingAddress());
+ assertEquals("speed < 88", dic.getFilterString());
+ assertEquals("org.foo.Transformer2", dic.getTransformerClassName());
+ assertEquals(false, dic.isExclusive());
+ }
+ }
+
+ assertEquals(2, conf.getBridgeConfigurations().size());
+ for (BridgeConfiguration bc : conf.getBridgeConfigurations())
+ {
+ if (bc.getName().equals("bridge1"))
+ {
+ assertEquals("bridge1", bc.getName());
+ assertEquals("queue1", bc.getQueueName());
+ assertEquals("bridge-forwarding-address1", bc.getForwardingAddress());
+ assertEquals("sku > 1", bc.getFilterString());
+ assertEquals("org.foo.BridgeTransformer", bc.getTransformerClassName());
+ assertEquals(3, bc.getRetryInterval());
+ assertEquals(0.2, bc.getRetryIntervalMultiplier());
+ assertEquals(2, bc.getReconnectAttempts());
+ assertEquals(false, bc.isFailoverOnServerShutdown());
+ assertEquals(true, bc.isUseDuplicateDetection());
+ assertEquals("connector1", bc.getConnectorPair().a);
+ assertEquals(null, bc.getConnectorPair().b);
+ assertEquals(null, bc.getDiscoveryGroupName());
+ }
+ else
+ {
+ assertEquals("bridge2", bc.getName());
+ assertEquals("queue2", bc.getQueueName());
+ assertEquals("bridge-forwarding-address2", bc.getForwardingAddress());
+ assertEquals(null, bc.getFilterString());
+ assertEquals(null, bc.getTransformerClassName());
+ assertEquals(null, bc.getConnectorPair());
+ assertEquals("dg1", bc.getDiscoveryGroupName());
+ }
+ }
+
+ assertEquals(2, conf.getClusterConfigurations().size());
+ for (ClusterConnectionConfiguration ccc : conf.getClusterConfigurations())
+ {
+ if (ccc.getName().equals("cluster-connection1"))
+ {
+ assertEquals("cluster-connection1", ccc.getName());
+ assertEquals("queues1", ccc.getAddress());
+ assertEquals(3, ccc.getRetryInterval());
+ assertEquals(true, ccc.isDuplicateDetection());
+ assertEquals(false, ccc.isForwardWhenNoConsumers());
+ assertEquals(1, ccc.getMaxHops());
+ assertEquals("connector1", ccc.getStaticConnectorNamePairs().get(0).a);
+ assertEquals("backup-connector", ccc.getStaticConnectorNamePairs().get(0).b);
+ assertEquals("connector2", ccc.getStaticConnectorNamePairs().get(1).a);
+ assertEquals(null, ccc.getStaticConnectorNamePairs().get(1).b);
+ assertEquals(null, ccc.getDiscoveryGroupName());
+ }
+ else
+ {
+ assertEquals("cluster-connection2", ccc.getName());
+ assertEquals("queues2", ccc.getAddress());
+ assertEquals(4, ccc.getRetryInterval());
+ assertEquals(false, ccc.isDuplicateDetection());
+ assertEquals(true, ccc.isForwardWhenNoConsumers());
+ assertEquals(2, ccc.getMaxHops());
+ assertEquals(null, ccc.getStaticConnectorNamePairs());
+ assertEquals("dg1", ccc.getDiscoveryGroupName());
+ }
+ }
+
}
public void testSetGetConfigurationURL()
@@ -205,7 +322,7 @@
{
FileConfiguration fc = new FileConfiguration();
- fc.setConfigurationUrl("ConfigurationTest-config.xml");
+ fc.setConfigurationUrl("ConfigurationTest-full-config.xml");
fc.start();
More information about the jboss-cvs-commits
mailing list