Author: clebert.suconic(a)jboss.com Date: 2011-11-01 15:49:48 -0400 (Tue, 01 Nov 2011) New Revision: 11625 Modified: branches/Branch_2_2_EAP/src/config/common/schema/hornetq-configuration.xsd branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/BridgeConfiguration.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java branches/Branch_2_2_EAP/tests/config/ConfigurationTest-full-config.xml branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithPagingTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java Log: https://issues.jboss.org/browse/JBPAPP-7455 - adding min-large-message-size to bridges and cluster-connections 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-10-31 22:43:35 UTC (rev 11624) +++ branches/Branch_2_2_EAP/src/config/common/schema/hornetq-configuration.xsd 2011-11-01 19:49:48 UTC (rev 11625) @@ -313,6 +313,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="check-period" type="xsd:long"> </xsd:element> <xsd:element maxOccurs="1" minOccurs="0" name="connection-ttl" type="xsd:long"> @@ -364,6 +366,8 @@ </xsd:element> <xsd:element maxOccurs="1" minOccurs="0" name="connection-ttl" type="xsd:long"> </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="call-timeout" type="xsd:long"> </xsd:element> <xsd:element maxOccurs="1" minOccurs="0" name="retry-interval" type="xsd:long"> Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/BridgeConfiguration.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/BridgeConfiguration.java 2011-10-31 22:43:35 UTC (rev 11624) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/BridgeConfiguration.java 2011-11-01 19:49:48 UTC (rev 11625) @@ -64,6 +64,8 @@ private final long connectionTTL; private final long maxRetryInterval; + + private final int minLargeMessageSize; public BridgeConfiguration(final String name, @@ -71,6 +73,7 @@ final String forwardingAddress, final String filterString, final String transformerClassName, + final int minLargeMessageSize, final long clientFailureCheckPeriod, final long connectionTTL, final long retryInterval, @@ -87,6 +90,7 @@ this.name = name; this.queueName = queueName; this.forwardingAddress = forwardingAddress; + this.minLargeMessageSize = minLargeMessageSize; this.filterString = filterString; this.transformerClassName = transformerClassName; this.retryInterval = retryInterval; @@ -108,6 +112,7 @@ final String forwardingAddress, final String filterString, final String transformerClassName, + final int minLargeMessageSize, final long clientFailureCheckPeriod, final long connectionTTL, final long retryInterval, @@ -126,6 +131,7 @@ this.forwardingAddress = forwardingAddress; this.filterString = filterString; this.transformerClassName = transformerClassName; + this.minLargeMessageSize = minLargeMessageSize; this.retryInterval = retryInterval; this.retryIntervalMultiplier = retryIntervalMultiplier; this.reconnectAttempts = reconnectAttempts; @@ -244,6 +250,14 @@ } /** + * @return the minLargeMessageSize + */ + public int getMinLargeMessageSize() + { + return minLargeMessageSize; + } + + /** * @param forwardingAddress the forwardingAddress to set */ public void setForwardingAddress(final String forwardingAddress) Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java 2011-10-31 22:43:35 UTC (rev 11624) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java 2011-11-01 19:49:48 UTC (rev 11625) @@ -66,6 +66,8 @@ private final boolean allowDirectConnectionsOnly; + private final int minLargeMessageSize; + public ClusterConnectionConfiguration(final String name, final String address, final String connectorName, @@ -80,6 +82,7 @@ this(name, address, connectorName, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, ConfigurationImpl.DEFAULT_CLUSTER_FAILURE_CHECK_PERIOD, ConfigurationImpl.DEFAULT_CLUSTER_CONNECTION_TTL, retryInterval, @@ -99,6 +102,7 @@ public ClusterConnectionConfiguration(final String name, final String address, final String connectorName, + final int minLargeMessageSize, final long clientFailureCheckPeriod, final long connectionTTL, final long retryInterval, @@ -130,6 +134,7 @@ this.maxHops = maxHops; this.confirmationWindowSize = confirmationWindowSize; this.allowDirectConnectionsOnly = allowDirectConnectionsOnly; + this.minLargeMessageSize = minLargeMessageSize; } @@ -146,6 +151,7 @@ this(name, address, connectorName, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, ConfigurationImpl.DEFAULT_CLUSTER_FAILURE_CHECK_PERIOD, ConfigurationImpl.DEFAULT_CLUSTER_CONNECTION_TTL, retryInterval, @@ -164,6 +170,7 @@ public ClusterConnectionConfiguration(final String name, final String address, final String connectorName, + final int minLargeMessageSize, final long clientFailureCheckPeriod, final long connectionTTL, final long retryInterval, @@ -193,6 +200,7 @@ this.staticConnectors = null; this.maxHops = maxHops; this.confirmationWindowSize = confirmationWindowSize; + this.minLargeMessageSize = minLargeMessageSize; allowDirectConnectionsOnly = false; } @@ -295,4 +303,15 @@ { return allowDirectConnectionsOnly; } + + + /** + * @return the minLargeMessageSize + */ + public int getMinLargeMessageSize() + { + return minLargeMessageSize; + } + + } Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2011-10-31 22:43:35 UTC (rev 11624) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2011-11-01 19:49:48 UTC (rev 11625) @@ -1021,6 +1021,8 @@ double retryIntervalMultiplier = XMLConfigurationUtil.getDouble(e, "retry-interval-multiplier", ConfigurationImpl.DEFAULT_CLUSTER_RETRY_INTERVAL_MULTIPLIER, Validators.GT_ZERO); + int minLargeMessageSize = XMLConfigurationUtil.getInteger(e, "min-large-message-size", HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, Validators.GT_ZERO); + long maxRetryInterval = XMLConfigurationUtil.getLong(e, "max-retry-interval", ConfigurationImpl.DEFAULT_CLUSTER_MAX_RETRY_INTERVAL, Validators.GT_ZERO); int reconnectAttempts = XMLConfigurationUtil.getInteger(e, "reconnect-attempts", ConfigurationImpl.DEFAULT_CLUSTER_RECONNECT_ATTEMPTS, Validators.MINUS_ONE_OR_GE_ZERO); @@ -1065,6 +1067,7 @@ config = new ClusterConnectionConfiguration(name, address, connectorName, + minLargeMessageSize, clientFailureCheckPeriod, connectionTTL, retryInterval, @@ -1084,6 +1087,7 @@ config = new ClusterConnectionConfiguration(name, address, connectorName, + minLargeMessageSize, clientFailureCheckPeriod, connectionTTL, retryInterval, @@ -1147,6 +1151,11 @@ long connectionTTL = XMLConfigurationUtil.getLong(brNode, "connection-ttl", HornetQClient.DEFAULT_CONNECTION_TTL, Validators.GT_ZERO) ; + int minLargeMessageSize = XMLConfigurationUtil.getInteger(brNode, + "min-large-message-size", + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + Validators.GT_ZERO); + long maxRetryInterval = XMLConfigurationUtil.getLong(brNode, "max-retry-interval", HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, Validators.GT_ZERO); @@ -1211,6 +1220,7 @@ forwardingAddress, filterString, transformerClassName, + minLargeMessageSize, clientFailureCheckPeriod, connectionTTL, retryInterval, @@ -1231,6 +1241,7 @@ forwardingAddress, filterString, transformerClassName, + minLargeMessageSize, clientFailureCheckPeriod, connectionTTL, retryInterval, Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2011-10-31 22:43:35 UTC (rev 11624) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2011-11-01 19:49:48 UTC (rev 11625) @@ -1709,6 +1709,7 @@ forwardingAddress, filterString, transformerClassName, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, clientFailureCheckPeriod, HornetQClient.DEFAULT_CONNECTION_TTL, retryInterval, @@ -1730,6 +1731,7 @@ forwardingAddress, filterString, transformerClassName, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, clientFailureCheckPeriod, HornetQClient.DEFAULT_CONNECTION_TTL, retryInterval, Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2011-10-31 22:43:35 UTC (rev 11624) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2011-11-01 19:49:48 UTC (rev 11625) @@ -142,7 +142,10 @@ private final Set<TransportConfiguration> allowableConnections = new HashSet<TransportConfiguration>(); private final ClusterManagerInternal manager; + + private final int minLargeMessageSize; + // Stuff that used to be on the ClusterManager private final Topology topology = new Topology(this); @@ -156,6 +159,7 @@ final TransportConfiguration connector, final SimpleString name, final SimpleString address, + final int minLargeMessageSize, final long clientFailureCheckPeriod, final long connectionTTL, final long retryInterval, @@ -237,6 +241,8 @@ this.manager = manager; this.callTimeout = callTimeout; + + this.minLargeMessageSize = minLargeMessageSize; clusterConnector = new StaticClusterConnector(tcConfigs); @@ -265,6 +271,7 @@ final TransportConfiguration connector, final SimpleString name, final SimpleString address, + final int minLargeMessageSize, final long clientFailureCheckPeriod, final long connectionTTL, final long retryInterval, @@ -310,6 +317,8 @@ this.retryIntervalMultiplier = retryIntervalMultiplier; this.maxRetryInterval = maxRetryInterval; + + this.minLargeMessageSize = minLargeMessageSize; this.reconnectAttempts = reconnectAttempts; @@ -902,6 +911,7 @@ targetLocator.setRetryInterval(retryInterval); targetLocator.setMaxRetryInterval(maxRetryInterval); targetLocator.setRetryIntervalMultiplier(retryIntervalMultiplier); + targetLocator.setMinLargeMessageSize(minLargeMessageSize); targetLocator.setAfterConnectionInternalListener(this); Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2011-10-31 22:43:35 UTC (rev 11624) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2011-11-01 19:49:48 UTC (rev 11625) @@ -470,6 +470,7 @@ serverLocator.setClientFailureCheckPeriod(config.getClientFailureCheckPeriod()); serverLocator.setBlockOnDurableSend(!config.isUseDuplicateDetection()); serverLocator.setBlockOnNonDurableSend(!config.isUseDuplicateDetection()); + serverLocator.setMinLargeMessageSize(config.getMinLargeMessageSize()); if (!config.isUseDuplicateDetection()) { log.debug("Bridge " + config.getName() + @@ -622,6 +623,7 @@ connector, new SimpleString(config.getName()), new SimpleString(config.getAddress()), + config.getMinLargeMessageSize(), config.getClientFailureCheckPeriod(), config.getConnectionTTL(), config.getRetryInterval(), @@ -659,6 +661,7 @@ connector, new SimpleString(config.getName()), new SimpleString(config.getAddress()), + config.getMinLargeMessageSize(), config.getClientFailureCheckPeriod(), config.getConnectionTTL(), config.getRetryInterval(), Modified: branches/Branch_2_2_EAP/tests/config/ConfigurationTest-full-config.xml =================================================================== --- branches/Branch_2_2_EAP/tests/config/ConfigurationTest-full-config.xml 2011-10-31 22:43:35 UTC (rev 11624) +++ branches/Branch_2_2_EAP/tests/config/ConfigurationTest-full-config.xml 2011-11-01 19:49:48 UTC (rev 11625) @@ -147,6 +147,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 +167,7 @@ <cluster-connection name="cluster-connection1"> <address>queues1</address> <connector-ref>connector1</connector-ref> + <min-large-message-size>321</min-large-message-size> <call-timeout>123</call-timeout> <retry-interval>3</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2011-10-31 22:43:35 UTC (rev 11624) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2011-11-01 19:49:48 UTC (rev 11625) @@ -124,6 +124,7 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, HornetQClient.DEFAULT_CONNECTION_TTL, retryInterval, @@ -268,6 +269,7 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, HornetQClient.DEFAULT_CONNECTION_TTL, retryInterval, @@ -396,6 +398,7 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, HornetQClient.DEFAULT_CONNECTION_TTL, retryInterval, @@ -540,6 +543,7 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, clientFailureCheckPeriod, HornetQClient.DEFAULT_CONNECTION_TTL, retryInterval, @@ -679,6 +683,7 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, HornetQClient.DEFAULT_CONNECTION_TTL, retryInterval, Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2011-10-31 22:43:35 UTC (rev 11624) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2011-11-01 19:49:48 UTC (rev 11625) @@ -109,6 +109,7 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, HornetQClient.DEFAULT_CONNECTION_TTL, 1000, @@ -279,6 +280,7 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, HornetQClient.DEFAULT_CONNECTION_TTL, 500, @@ -496,6 +498,7 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, HornetQClient.DEFAULT_CONNECTION_TTL, 1000, @@ -652,6 +655,7 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, HornetQClient.DEFAULT_CONNECTION_TTL, 1000, Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2011-10-31 22:43:35 UTC (rev 11624) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2011-11-01 19:49:48 UTC (rev 11625) @@ -141,6 +141,7 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, HornetQClient.DEFAULT_CONNECTION_TTL, 1000, @@ -349,6 +350,7 @@ forwardAddress, filterString, null, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, HornetQClient.DEFAULT_CONNECTION_TTL, 1000, @@ -538,6 +540,7 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, HornetQClient.DEFAULT_CONNECTION_TTL, 100, @@ -698,6 +701,7 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, HornetQClient.DEFAULT_CONNECTION_TTL, 100, @@ -891,6 +895,7 @@ forwardAddress, null, SimpleTransformer.class.getName(), + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, HornetQClient.DEFAULT_CONNECTION_TTL, 1000, @@ -1044,6 +1049,7 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, HornetQClient.DEFAULT_CONNECTION_TTL, 1000, @@ -1290,6 +1296,7 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, HornetQClient.DEFAULT_CONNECTION_TTL, 1000, @@ -1441,6 +1448,7 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, HornetQClient.DEFAULT_CONNECTION_TTL, 1000, @@ -1601,6 +1609,7 @@ // address null, null, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, HornetQClient.DEFAULT_CONNECTION_TTL, 1000, Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2011-10-31 22:43:35 UTC (rev 11624) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2011-11-01 19:49:48 UTC (rev 11625) @@ -116,6 +116,7 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, HornetQClient.DEFAULT_CONNECTION_TTL, 1000, Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithPagingTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithPagingTest.java 2011-10-31 22:43:35 UTC (rev 11624) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithPagingTest.java 2011-11-01 19:49:48 UTC (rev 11625) @@ -113,6 +113,7 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, HornetQClient.DEFAULT_CONNECTION_TTL, retryInterval, Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2011-10-31 22:43:35 UTC (rev 11624) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2011-11-01 19:49:48 UTC (rev 11625) @@ -1921,6 +1921,7 @@ ClusterConnectionConfiguration clusterConf = new ClusterConnectionConfiguration(name, address, connectorFrom.getName(), + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, ConfigurationImpl.DEFAULT_CLUSTER_FAILURE_CHECK_PERIOD, ConfigurationImpl.DEFAULT_CLUSTER_CONNECTION_TTL, retryInterval, Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2011-10-31 22:43:35 UTC (rev 11624) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2011-11-01 19:49:48 UTC (rev 11625) @@ -166,6 +166,7 @@ targetQueueConfig.getAddress(), null, null, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, HornetQClient.DEFAULT_CONNECTION_TTL, RandomUtil.randomPositiveLong(), Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2011-10-31 22:43:35 UTC (rev 11624) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2011-11-01 19:49:48 UTC (rev 11625) @@ -144,6 +144,7 @@ targetQueueConfig.getAddress(), null, null, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, HornetQClient.DEFAULT_CONNECTION_TTL, RandomUtil.randomPositiveLong(), 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-10-31 22:43:35 UTC (rev 11624) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java 2011-11-01 19:49:48 UTC (rev 11625) @@ -199,6 +199,7 @@ { Assert.assertEquals("bridge1", bc.getName()); Assert.assertEquals("queue1", bc.getQueueName()); + Assert.assertEquals(4, bc.getMinLargeMessageSize()); Assert.assertEquals("bridge-forwarding-address1", bc.getForwardingAddress()); Assert.assertEquals("sku > 1", bc.getFilterString()); Assert.assertEquals("org.foo.BridgeTransformer", bc.getTransformerClassName()); @@ -227,6 +228,7 @@ if (ccc.getName().equals("cluster-connection1")) { Assert.assertEquals("cluster-connection1", ccc.getName()); + Assert.assertEquals(321, ccc.getMinLargeMessageSize()); Assert.assertEquals("queues1", ccc.getAddress()); Assert.assertEquals(3, ccc.getRetryInterval()); Assert.assertEquals(true, ccc.isDuplicateDetection());