Author: clebert.suconic(a)jboss.com Date: 2011-08-09 00:01:15 -0400 (Tue, 09 Aug 2011) New Revision: 11155 Modified: branches/Branch_2_2_EAP/src/config/common/schema/hornetq-configuration.xsd branches/Branch_2_2_EAP/tests/config/ConfigurationTest-full-config.xml branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java Log: Adding call timeout on file configuration Modified: branches/Branch_2_2_EAP/src/config/common/schema/hornetq-configuration.xsd =================================================================== --- branches/Branch_2_2_EAP/src/config/common/schema/hornetq-configuration.xsd 2011-08-09 02:57:54 UTC (rev 11154) +++ branches/Branch_2_2_EAP/src/config/common/schema/hornetq-configuration.xsd 2011-08-09 04:01:15 UTC (rev 11155) @@ -364,6 +364,8 @@ </xsd:element> <xsd:element maxOccurs="1" minOccurs="0" name="connection-ttl" type="xsd:long"> </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="call-timeout" type="xsd:long"> + </xsd:element> <xsd:element maxOccurs="1" minOccurs="0" name="retry-interval" type="xsd:long"> </xsd:element> <xsd:element maxOccurs="1" minOccurs="0" name="retry-interval-multiplier" type="xsd:double"> Modified: branches/Branch_2_2_EAP/tests/config/ConfigurationTest-full-config.xml =================================================================== --- branches/Branch_2_2_EAP/tests/config/ConfigurationTest-full-config.xml 2011-08-09 02:57:54 UTC (rev 11154) +++ branches/Branch_2_2_EAP/tests/config/ConfigurationTest-full-config.xml 2011-08-09 04:01:15 UTC (rev 11155) @@ -166,6 +166,7 @@ <cluster-connection name="cluster-connection1"> <address>queues1</address> <connector-ref>connector1</connector-ref> + <call-timeout>123</call-timeout> <retry-interval>3</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> <forward-when-no-consumers>false</forward-when-no-consumers> @@ -178,6 +179,7 @@ <cluster-connection name="cluster-connection2"> <address>queues2</address> <connector-ref>connector2</connector-ref> + <call-timeout>456</call-timeout> <retry-interval>4</retry-interval> <use-duplicate-detection>false</use-duplicate-detection> <forward-when-no-consumers>true</forward-when-no-consumers> Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java 2011-08-09 02:57:54 UTC (rev 11154) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java 2011-08-09 04:01:15 UTC (rev 11155) @@ -232,6 +232,7 @@ Assert.assertEquals(true, ccc.isDuplicateDetection()); Assert.assertEquals(false, ccc.isForwardWhenNoConsumers()); Assert.assertEquals(1, ccc.getMaxHops()); + Assert.assertEquals(123, ccc.getCallTimeout()); Assert.assertEquals("connector1", ccc.getStaticConnectors().get(0)); Assert.assertEquals("connector2", ccc.getStaticConnectors().get(1)); Assert.assertEquals(null, ccc.getDiscoveryGroupName()); @@ -241,6 +242,7 @@ Assert.assertEquals("cluster-connection2", ccc.getName()); Assert.assertEquals("queues2", ccc.getAddress()); Assert.assertEquals(4, ccc.getRetryInterval()); + Assert.assertEquals(456, ccc.getCallTimeout()); Assert.assertEquals(false, ccc.isDuplicateDetection()); Assert.assertEquals(true, ccc.isForwardWhenNoConsumers()); Assert.assertEquals(2, ccc.getMaxHops());