9:18 a.m.
Author: borges
Date: 2012-02-16 10:17:59 -0500 (Thu, 16 Feb 2012)
New Revision: 12129
Modified:
trunk/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd
trunk/hornetq-core/src/test/java/org/hornetq/core/config/impl/FileConfigurationTest.java
trunk/hornetq-core/src/test/resources/ConfigurationTest-full-config.xml
Log:
HORNETQ-855 Fix configuration file tests by adding the following options:
- page-max-concurrent-io
- bridge.min-large-message-size
- clusterConf.min-large-message-size
Modified: trunk/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd
===================================================================
--- trunk/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd 2012-02-16
14:07:03 UTC (rev 12128)
+++ trunk/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd 2012-02-16
15:17:59 UTC (rev 12129)
@@ -7,8 +7,8 @@
<xsd:element maxOccurs="1" minOccurs="0" name="name"
type="xsd:string">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
ref="clustered"/>
- <xsd:element maxOccurs="1" minOccurs="0"
ref="file-deployment-enabled"/>
- <xsd:element maxOccurs="1" minOccurs="0"
ref="persistence-enabled"/>
+ <xsd:element maxOccurs="1" minOccurs="0"
ref="file-deployment-enabled"/>
+ <xsd:element maxOccurs="1" minOccurs="0"
ref="persistence-enabled"/>
<xsd:element maxOccurs="1" minOccurs="0"
name="scheduled-thread-pool-max-size" type="xsd:int">
<xsd:annotation>
<xsd:documentation>
@@ -34,9 +34,9 @@
<xsd:element maxOccurs="1" minOccurs="0"
name="management-notification-address" type="xsd:string">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="cluster-user" type="xsd:string">
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="cluster-password" type="xsd:string">
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="log-delegate-factory-class-name" type="xsd:string">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="jmx-management-enabled" type="xsd:boolean">
@@ -52,7 +52,7 @@
<xsd:element maxOccurs="1" minOccurs="0"
name="connection-ttl-override" type="xsd:long">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="async-connection-execution-enabled" type="xsd:boolean">
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="transaction-timeout" type="xsd:long">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="transaction-timeout-scan-period" type="xsd:long">
@@ -76,11 +76,11 @@
<xsd:element maxOccurs="1" minOccurs="0"
name="failover-on-shutdown" type="xsd:boolean">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="shared-store" type="xsd:boolean">
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="persist-delivery-count-before-delivery" type="xsd:boolean">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="live-connector-ref" type="live-connectorType">
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="connectors">
<xsd:complexType>
<xsd:sequence>
@@ -146,16 +146,18 @@
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="create-bindings-dir" type="xsd:boolean">
</xsd:element>
+ <xsd:element maxOccurs="1" minOccurs="0"
name="page-max-concurrent-io" type="xsd:int">
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="journal-directory" type="xsd:string">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="create-journal-dir" type="xsd:boolean">
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="journal-type" type="journalType">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="journal-buffer-timeout" type="xsd:long">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="journal-buffer-size" type="xsd:long">
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="journal-sync-transactional" type="xsd:boolean">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="journal-sync-non-transactional" type="xsd:boolean">
@@ -181,7 +183,7 @@
<xsd:element maxOccurs="1" minOccurs="0"
name="memory-warning-threshold" type="xsd:int">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="memory-measure-interval" type="xsd:long">
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="large-messages-directory" type="xsd:string">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="security-settings">
@@ -200,9 +202,9 @@
</xsd:element>
<xsd:element name="clustered" type="xsd:boolean"/>
-
+
<xsd:element name="file-deployment-enabled"
type="xsd:boolean"/>
-
+
<xsd:element name="persistence-enabled" type="xsd:boolean"/>
<xsd:element name="local-bind-address" type="xsd:string"/>
@@ -298,7 +300,7 @@
<xsd:attribute name="name" type="xsd:string"
use="optional"/>
</xsd:complexType>
- <xsd:complexType name="bridgeType">
+ <xsd:complexType name="bridgeType">
<xsd:sequence>
<xsd:element maxOccurs="1" minOccurs="1"
name="queue-name" type="xsd:IDREF">
</xsd:element>
@@ -313,6 +315,8 @@
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="transformer-class-name" type="xsd:string">
</xsd:element>
+ <xsd:element maxOccurs="1" minOccurs="0"
name="min-large-message-size" type="xsd:int">
+ </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">
@@ -329,14 +333,14 @@
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="password" type="xsd:string">
</xsd:element>
- <xsd:choice>
+ <xsd:choice>
<xsd:element maxOccurs="1" minOccurs="1"
name="static-connectors">
<xsd:complexType>
<xsd:sequence>
<xsd:element maxOccurs="unbounded"
minOccurs="1" name="connector-ref" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="1"
name="discovery-group-ref">
<xsd:complexType>
<xsd:attribute name="discovery-group-name" type="xsd:IDREF"
use="required">
@@ -344,18 +348,19 @@
</xsd:complexType>
</xsd:element>
</xsd:choice>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string"
use="required"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string"
use="required"/>
</xsd:complexType>
-
- <xsd:complexType name="clusterConnectionType">
+
+ <xsd:complexType name="clusterConnectionType">
<xsd:sequence>
<xsd:element maxOccurs="1" minOccurs="1"
name="address" type="xsd:string">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="1"
name="connector-ref" type="xsd:string">
</xsd:element>
+ <xsd:element maxOccurs="1" minOccurs="0"
name="min-large-message-size" type="xsd:int"/>
<xsd:element maxOccurs="1" minOccurs="0"
name="retry-interval" type="xsd:long">
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="use-duplicate-detection" type="xsd:boolean">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="forward-when-no-consumers" type="xsd:boolean">
@@ -373,7 +378,7 @@
</xsd:sequence>
<xsd:attribute name="allow-direct-connections-only"
type="xsd:boolean" use="optional"/>
</xsd:complexType>
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="discovery-group-ref">
<xsd:complexType>
<xsd:attribute name="discovery-group-name" type="xsd:IDREF"
use="required">
@@ -385,7 +390,7 @@
<xsd:attribute name="name" type="xsd:string"
use="required"/>
</xsd:complexType>
- <xsd:complexType name="divertType">
+ <xsd:complexType name="divertType">
<xsd:sequence>
<xsd:element maxOccurs="1" minOccurs="0"
name="routing-name" type="xsd:string">
</xsd:element>
@@ -402,8 +407,8 @@
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="exclusive" type="xsd:boolean">
</xsd:element>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string"
use="required"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string"
use="required"/>
</xsd:complexType>
<xsd:simpleType name="journalType">
@@ -460,7 +465,7 @@
</xsd:sequence>
</xsd:complexType>
</xsd:element>
-
+
<xsd:element name="address-setting">
<xsd:complexType>
<xsd:all>
@@ -479,7 +484,7 @@
<xsd:element maxOccurs="1" minOccurs="0"
name="page-max-cache-size" type="xsd:int">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="address-full-policy" type="addressFullMessagePolicyType">
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="message-counter-history-day-limit" type="xsd:int">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="last-value-queue" type="xsd:boolean">
@@ -490,9 +495,9 @@
</xsd:element>
</xsd:all>
<xsd:attribute name="match" type="xsd:string"
use="required"/>
- </xsd:complexType>
+ </xsd:complexType>
</xsd:element>
-
+
<xsd:element name="queues">
<xsd:complexType>
<xsd:sequence>
@@ -501,7 +506,7 @@
</xsd:sequence>
</xsd:complexType>
</xsd:element>
-
+
<xsd:element name="queue">
<xsd:complexType>
<xsd:all>
@@ -518,12 +523,12 @@
<xsd:attribute name="name" type="xsd:ID"
use="required"/>
</xsd:complexType>
</xsd:element>
-
+
<xsd:complexType name="live-connectorType">
<xsd:attribute name="connector-name" type="xsd:IDREF"
use="required">
</xsd:attribute>
</xsd:complexType>
-
+
<xsd:simpleType name="addressFullMessagePolicyType">
<xsd:restriction base="xsd:string">
<xsd:enumeration value="DROP"/>
@@ -531,7 +536,7 @@
<xsd:enumeration value="BLOCK"/>
</xsd:restriction>
</xsd:simpleType>
-
+
<xsd:complexType name="connectorServiceType">
<xsd:sequence>
<xsd:element maxOccurs="1" minOccurs="1"
name="factory-class" type="xsd:string">
Modified:
trunk/hornetq-core/src/test/java/org/hornetq/core/config/impl/FileConfigurationTest.java
===================================================================
---
trunk/hornetq-core/src/test/java/org/hornetq/core/config/impl/FileConfigurationTest.java 2012-02-16
14:07:03 UTC (rev 12128)
+++
trunk/hornetq-core/src/test/java/org/hornetq/core/config/impl/FileConfigurationTest.java 2012-02-16
15:17:59 UTC (rev 12129)
@@ -23,7 +23,6 @@
import org.hornetq.core.config.ClusterConnectionConfiguration;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.DivertConfiguration;
-import org.hornetq.core.config.impl.FileConfiguration;
import org.hornetq.core.security.Role;
import org.hornetq.core.server.JournalType;
@@ -70,8 +69,8 @@
Assert.assertEquals("pagingdir", conf.getPagingDirectory());
Assert.assertEquals("somedir", conf.getBindingsDirectory());
Assert.assertEquals(false, conf.isCreateBindingsDir());
-
- Assert.assertEquals(17, conf.getPageMaxConcurrentIO());
+
+ Assert.assertEquals("max concurrent io", 17,
conf.getPageMaxConcurrentIO());
Assert.assertEquals("somedir2", conf.getJournalDirectory());
Assert.assertEquals(false, conf.isCreateJournalDir());
Assert.assertEquals(JournalType.NIO, conf.getJournalType());
@@ -201,7 +200,7 @@
{
Assert.assertEquals("bridge1", bc.getName());
Assert.assertEquals("queue1", bc.getQueueName());
- Assert.assertEquals(4, bc.getMinLargeMessageSize());
+ Assert.assertEquals("minLargeMessageSize", 4,
bc.getMinLargeMessageSize());
Assert.assertEquals("bridge-forwarding-address1",
bc.getForwardingAddress());
Assert.assertEquals("sku > 1", bc.getFilterString());
Assert.assertEquals("org.foo.BridgeTransformer",
bc.getTransformerClassName());
@@ -230,7 +229,7 @@
if (ccc.getName().equals("cluster-connection1"))
{
Assert.assertEquals("cluster-connection1", ccc.getName());
- Assert.assertEquals(321, ccc.getMinLargeMessageSize());
+ Assert.assertEquals("clusterConnectionConf minLargeMessageSize",
321, ccc.getMinLargeMessageSize());
Assert.assertEquals("queues1", ccc.getAddress());
Assert.assertEquals(3, ccc.getRetryInterval());
Assert.assertEquals(true, ccc.isDuplicateDetection());
@@ -254,13 +253,13 @@
Assert.assertEquals("dg1", ccc.getDiscoveryGroupName());
}
}
-
-
+
+
assertEquals(2, conf.getAddressesSettings().size());
-
+
assertTrue(conf.getAddressesSettings().get("a1") != null);
assertTrue(conf.getAddressesSettings().get("a2") != null);
-
+
assertEquals("a1.1",
conf.getAddressesSettings().get("a1").getDeadLetterAddress().toString());
assertEquals("a1.2",
conf.getAddressesSettings().get("a1").getExpiryAddress().toString());
assertEquals(1,
conf.getAddressesSettings().get("a1").getRedeliveryDelay());
@@ -276,28 +275,28 @@
assertEquals(7126716262626l,
conf.getAddressesSettings().get("a2").getPageSizeBytes());
assertEquals(20,
conf.getAddressesSettings().get("a2").getPageCacheMaxSize());
assertEquals(8,
conf.getAddressesSettings().get("a2").getMessageCounterHistoryDayLimit());
-
-
+
+
assertEquals(2, conf.getQueueConfigurations().size());
-
+
assertEquals("queue1", conf.getQueueConfigurations().get(0).getName());
assertEquals("address1",
conf.getQueueConfigurations().get(0).getAddress());
assertEquals("color='red'",
conf.getQueueConfigurations().get(0).getFilterString());
assertEquals(false, conf.getQueueConfigurations().get(0).isDurable());
-
+
assertEquals("queue2", conf.getQueueConfigurations().get(1).getName());
assertEquals("address2",
conf.getQueueConfigurations().get(1).getAddress());
assertEquals("color='blue'",
conf.getQueueConfigurations().get(1).getFilterString());
assertEquals(false, conf.getQueueConfigurations().get(1).isDurable());
-
+
assertEquals(2, conf.getSecurityRoles().size());
assertTrue(conf.getSecurityRoles().containsKey("a1"));
-
+
assertTrue(conf.getSecurityRoles().containsKey("a2"));
-
+
Role a1Role = conf.getSecurityRoles().get("a1").toArray(new Role[1])[0];
-
+
assertFalse(a1Role.isSend());
assertFalse(a1Role.isConsume());
assertFalse(a1Role.isCreateDurableQueue());
@@ -305,9 +304,9 @@
assertTrue(a1Role.isCreateNonDurableQueue());
assertFalse(a1Role.isDeleteNonDurableQueue());
assertFalse(a1Role.isManage());
-
+
Role a2Role = conf.getSecurityRoles().get("a2").toArray(new Role[1])[0];
-
+
assertFalse(a2Role.isSend());
assertFalse(a2Role.isConsume());
assertFalse(a2Role.isCreateDurableQueue());
@@ -315,8 +314,8 @@
assertFalse(a2Role.isCreateNonDurableQueue());
assertTrue(a2Role.isDeleteNonDurableQueue());
assertFalse(a2Role.isManage());
-
+
}
public void testSetGetConfigurationURL()
Modified: trunk/hornetq-core/src/test/resources/ConfigurationTest-full-config.xml
===================================================================
--- trunk/hornetq-core/src/test/resources/ConfigurationTest-full-config.xml 2012-02-16
14:07:03 UTC (rev 12128)
+++ trunk/hornetq-core/src/test/resources/ConfigurationTest-full-config.xml 2012-02-16
15:17:59 UTC (rev 12129)
@@ -35,6 +35,7 @@
<bindings-directory>somedir</bindings-directory>
<create-bindings-dir>false</create-bindings-dir>
<journal-directory>somedir2</journal-directory>
+ <page-max-concurrent-io>17</page-max-concurrent-io>
<create-journal-dir>false</create-journal-dir>
<journal-type>NIO</journal-type>
<journal-compact-min-files>123</journal-compact-min-files>
@@ -147,6 +148,7 @@
<forwarding-address>bridge-forwarding-address1</forwarding-address>
<filter string="sku > 1"/>
<transformer-class-name>org.foo.BridgeTransformer</transformer-class-name>
+ <min-large-message-size>4</min-large-message-size>
<retry-interval>3</retry-interval>
<retry-interval-multiplier>0.2</retry-interval-multiplier>
<reconnect-attempts>2</reconnect-attempts>
@@ -166,6 +168,7 @@
<cluster-connection name="cluster-connection1">
<address>queues1</address>
<connector-ref>connector1</connector-ref>
+ <min-large-message-size>321</min-large-message-size>
<retry-interval>3</retry-interval>
<use-duplicate-detection>true</use-duplicate-detection>
<forward-when-no-consumers>false</forward-when-no-consumers>