[jboss-cvs] JBoss Messaging SVN: r5507 - in trunk: src/main/org/jboss/messaging/core/client/impl and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Dec 10 13:12:09 EST 2008
Author: timfox
Date: 2008-12-10 13:12:09 -0500 (Wed, 10 Dec 2008)
New Revision: 5507
Added:
trunk/src/main/org/jboss/messaging/core/client/impl/ClientMessageInternal.java
Modified:
trunk/src/main/org/jboss/messaging/core/client/ClientFileMessage.java
trunk/src/main/org/jboss/messaging/core/client/ClientMessage.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerInternal.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientMessageImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionInternal.java
trunk/src/main/org/jboss/messaging/core/config/cluster/BroadcastGroupConfiguration.java
trunk/src/main/org/jboss/messaging/core/config/cluster/MessageFlowConfiguration.java
trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionReceiveMessage.java
trunk/src/main/org/jboss/messaging/core/server/cluster/impl/ClusterManagerImpl.java
trunk/src/main/org/jboss/messaging/core/server/cluster/impl/MessageFlowImpl.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/BasicMessageFlowTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/DiscoveryFlowTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowBatchSizeTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowBatchTimeTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowReconnectTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowTransformerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowWildcardTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowWithFilterTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/StaticFlowTest.java
Log:
Added clientmessageinternal
Modified: trunk/src/main/org/jboss/messaging/core/client/ClientFileMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/ClientFileMessage.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/src/main/org/jboss/messaging/core/client/ClientFileMessage.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -25,6 +25,7 @@
import java.io.File;
import java.nio.channels.FileChannel;
+import org.jboss.messaging.core.client.impl.ClientMessageInternal;
import org.jboss.messaging.core.exception.MessagingException;
/**
@@ -36,7 +37,7 @@
*
*
*/
-public interface ClientFileMessage extends ClientMessage
+public interface ClientFileMessage extends ClientMessageInternal
{
File getFile();
Modified: trunk/src/main/org/jboss/messaging/core/client/ClientMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/ClientMessage.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/src/main/org/jboss/messaging/core/client/ClientMessage.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -46,11 +46,4 @@
void acknowledge() throws MessagingException;
boolean isLargeMessage();
-
- /** Size used for FlowControl */
- int getFlowControlSize();
-
- /** Size used for FlowControl */
- void setFlowControlSize(int flowControlSize);
-
}
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -66,13 +66,13 @@
private final int ackBatchSize;
- private final Queue<ClientMessage> buffer = new LinkedList<ClientMessage>();
+ private final Queue<ClientMessageInternal> buffer = new LinkedList<ClientMessageInternal>();
private final Runner runner = new Runner();
private final File directory;
- private ClientMessage currentChunkMessage;
+ private ClientMessageInternal currentChunkMessage;
private volatile Thread receiverThread;
@@ -147,7 +147,7 @@
{
while (true)
{
- ClientMessage m = null;
+ ClientMessageInternal m = null;
synchronized (this)
{
@@ -299,7 +299,7 @@
return id;
}
- public synchronized void handleMessage(final ClientMessage message) throws Exception
+ public synchronized void handleMessage(final ClientMessageInternal message) throws Exception
{
if (closing)
{
@@ -307,7 +307,7 @@
return;
}
- ClientMessage messageToHandle = message;
+ ClientMessageInternal messageToHandle = message;
if (isFileConsumer())
{
@@ -394,8 +394,10 @@
currentChunkMessage.setFlowControlSize(chunk.getBody().length);
- ClientMessage msgToSend = currentChunkMessage;
+ ClientMessageInternal msgToSend = currentChunkMessage;
+
currentChunkMessage = null;
+
handleMessage(msgToSend);
}
}
@@ -523,7 +525,7 @@
// ordering. If we just added a Runnable with the message to the executor immediately as we get it
// we could not do that
- ClientMessage message;
+ ClientMessageInternal message;
// Must store handler in local variable since might get set to null
// otherwise while this is executing and give NPE when calling onMessage
@@ -560,7 +562,7 @@
* @param message
* @throws MessagingException
*/
- private void flowControlBeforeConsumption(final ClientMessage message) throws MessagingException
+ private void flowControlBeforeConsumption(final ClientMessageInternal message) throws MessagingException
{
// Chunk messages will execute the flow control while receiving the chunks
flowControl(message.getFlowControlSize());
@@ -663,7 +665,7 @@
}
}
- private ClientMessage createFileMessage(final byte[] header) throws Exception
+ private ClientMessageInternal createFileMessage(final byte[] header) throws Exception
{
MessagingBuffer headerBuffer = new ByteBufferWrapper(ByteBuffer.wrap(header));
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerInternal.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerInternal.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerInternal.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -38,7 +38,7 @@
{
long getID();
- void handleMessage(ClientMessage message) throws Exception;
+ void handleMessage(ClientMessageInternal message) throws Exception;
void handleLargeMessage(byte[] largeMessageHeader) throws Exception;
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientMessageImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientMessageImpl.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientMessageImpl.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -36,7 +36,7 @@
* @author <a href="mailto:ataylor at redhat.com">Andy Taylor</a>
*
*/
-public class ClientMessageImpl extends MessageImpl implements ClientMessage
+public class ClientMessageImpl extends MessageImpl implements ClientMessageInternal
{
// added this constant here so that the client package have no dependency on JMS
public static final SimpleString REPLYTO_HEADER_NAME = new SimpleString("JMSReplyTo");
Added: trunk/src/main/org/jboss/messaging/core/client/impl/ClientMessageInternal.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientMessageInternal.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientMessageInternal.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+
+package org.jboss.messaging.core.client.impl;
+
+import org.jboss.messaging.core.client.ClientMessage;
+
+/**
+ * A ClientMessageInternal
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ * Created 10 Dec 2008 18:05:24
+ *
+ *
+ */
+public interface ClientMessageInternal extends ClientMessage
+{
+ /** Size used for FlowControl */
+ int getFlowControlSize();
+
+ /** Size used for FlowControl */
+ void setFlowControlSize(int flowControlSize);
+}
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -92,7 +92,7 @@
public static final int DEFAULT_MAX_RETRIES_BEFORE_FAILOVER = 0;
public static final int DEFAULT_MAX_RETRIES_AFTER_FAILOVER = 10;
-
+
// Attributes
// -----------------------------------------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -630,7 +630,7 @@
producers.remove(producer);
}
- public void handleReceiveMessage(final long consumerID, final ClientMessage message) throws Exception
+ public void handleReceiveMessage(final long consumerID, final ClientMessageInternal message) throws Exception
{
ClientConsumerInternal consumer = consumers.get(consumerID);
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionInternal.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionInternal.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionInternal.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -12,7 +12,6 @@
package org.jboss.messaging.core.client.impl;
-import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.RemotingConnection;
@@ -39,7 +38,7 @@
void removeProducer(ClientProducerInternal producer);
- void handleReceiveMessage(long consumerID, ClientMessage message) throws Exception;
+ void handleReceiveMessage(long consumerID, ClientMessageInternal message) throws Exception;
void handleReceiveLargeMessage(final long consumerID, final byte[] headerBytes) throws Exception;
Modified: trunk/src/main/org/jboss/messaging/core/config/cluster/BroadcastGroupConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/cluster/BroadcastGroupConfiguration.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/src/main/org/jboss/messaging/core/config/cluster/BroadcastGroupConfiguration.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -43,8 +43,7 @@
private static final long serialVersionUID = 1052413739064253955L;
private static final Logger log = Logger.getLogger(BroadcastGroupConfiguration.class);
-
-
+
private final String name;
private final String localBindAddress;
Modified: trunk/src/main/org/jboss/messaging/core/config/cluster/MessageFlowConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/cluster/MessageFlowConfiguration.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/src/main/org/jboss/messaging/core/config/cluster/MessageFlowConfiguration.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -65,6 +65,8 @@
private final int maxRetriesBeforeFailover;
private final int maxRetriesAfterFailover;
+
+ private final boolean useDuplicateDetection;
public MessageFlowConfiguration(final String name,
final String address,
@@ -77,6 +79,7 @@
final double retryIntervalMultiplier,
final int maxRetriesBeforeFailover,
final int maxRetriesAfterFailover,
+ final boolean useDuplicateDetection,
final List<Pair<String, String>> staticConnectorNamePairs)
{
this.name = name;
@@ -90,6 +93,7 @@
this.retryIntervalMultiplier = retryIntervalMultiplier;
this.maxRetriesBeforeFailover = maxRetriesBeforeFailover;
this.maxRetriesAfterFailover = maxRetriesAfterFailover;
+ this.useDuplicateDetection = useDuplicateDetection;
this.staticConnectorNamePairs = staticConnectorNamePairs;
this.discoveryGroupName = null;
}
@@ -105,6 +109,7 @@
final double retryIntervalMultiplier,
final int maxRetriesBeforeFailover,
final int maxRetriesAfterFailover,
+ final boolean useDuplicateDetection,
final String discoveryGroupName)
{
this.name = name;
@@ -118,6 +123,7 @@
this.retryIntervalMultiplier = retryIntervalMultiplier;
this.maxRetriesBeforeFailover = maxRetriesBeforeFailover;
this.maxRetriesAfterFailover = maxRetriesAfterFailover;
+ this.useDuplicateDetection = useDuplicateDetection;
this.staticConnectorNamePairs = null;
this.discoveryGroupName = discoveryGroupName;
}
@@ -191,4 +197,9 @@
{
return maxRetriesAfterFailover;
}
+
+ public boolean isUseDuplicateDetection()
+ {
+ return useDuplicateDetection;
+ }
}
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -112,7 +112,10 @@
public static final int DEFAULT_ID_CACHE_SIZE = 100;
public static final boolean DEFAULT_PERSIST_ID_CACHE = true;
+
+ public static final boolean DEFAULT_USE_DUPLICATE_DETECTION = true;
+
// Attributes -----------------------------------------------------------------------------
protected boolean clustered = DEFAULT_CLUSTERED;
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -35,7 +35,6 @@
import java.util.List;
import java.util.Map;
-import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.cluster.BroadcastGroupConfiguration;
import org.jboss.messaging.core.config.cluster.DiscoveryGroupConfiguration;
@@ -532,6 +531,8 @@
int maxRetriesBeforeFailover = DEFAULT_MAX_RETRIES_BEFORE_FAILOVER;
int maxRetriesAfterFailover = DEFAULT_MAX_RETRIES_AFTER_FAILOVER;
+
+ boolean useDuplicateDetection = DEFAULT_USE_DUPLICATE_DETECTION;
NodeList children = bgNode.getChildNodes();
@@ -583,6 +584,10 @@
{
maxRetriesAfterFailover = XMLUtil.parseInt(child);
}
+ else if (child.getNodeName().equals("use-duplicate-detection"))
+ {
+ useDuplicateDetection = XMLUtil.parseBoolean(child);
+ }
else if (child.getNodeName().equals("connector"))
{
String connectorName = child.getAttributes().getNamedItem("connector-name").getNodeValue();
@@ -615,6 +620,7 @@
retryIntervalMultiplier,
maxRetriesBeforeFailover,
maxRetriesAfterFailover,
+ useDuplicateDetection,
staticConnectorNames);
}
else
@@ -629,7 +635,8 @@
retryInterval,
retryIntervalMultiplier,
maxRetriesBeforeFailover,
- maxRetriesAfterFailover,
+ maxRetriesAfterFailover,
+ useDuplicateDetection,
discoveryGroupName);
}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionReceiveMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionReceiveMessage.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionReceiveMessage.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -24,6 +24,7 @@
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.impl.ClientMessageImpl;
+import org.jboss.messaging.core.client.impl.ClientMessageInternal;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.server.ServerMessage;
@@ -50,7 +51,7 @@
private byte[] largeMessageHeader;
- private ClientMessage clientMessage;
+ private ClientMessageInternal clientMessage;
private ServerMessage serverMessage;
@@ -100,7 +101,7 @@
return consumerID;
}
- public ClientMessage getClientMessage()
+ public ClientMessageInternal getClientMessage()
{
return clientMessage;
}
Modified: trunk/src/main/org/jboss/messaging/core/server/cluster/impl/ClusterManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/cluster/impl/ClusterManagerImpl.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/src/main/org/jboss/messaging/core/server/cluster/impl/ClusterManagerImpl.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -368,6 +368,7 @@
config.getRetryIntervalMultiplier(),
config.getMaxRetriesBeforeFailover(),
config.getMaxRetriesAfterFailover(),
+ config.isUseDuplicateDetection(),
conns);
}
else
@@ -401,6 +402,7 @@
config.getRetryIntervalMultiplier(),
config.getMaxRetriesBeforeFailover(),
config.getMaxRetriesAfterFailover(),
+ config.isUseDuplicateDetection(),
group);
}
Modified: trunk/src/main/org/jboss/messaging/core/server/cluster/impl/MessageFlowImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/cluster/impl/MessageFlowImpl.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/src/main/org/jboss/messaging/core/server/cluster/impl/MessageFlowImpl.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -99,6 +99,8 @@
private final int maxRetriesBeforeFailover;
private final int maxRetriesAfterFailover;
+
+ private final boolean useDuplicateDetection;
/*
* Constructor using static list of connectors
@@ -119,6 +121,7 @@
final double retryIntervalMultiplier,
final int maxRetriesBeforeFailover,
final int maxRetriesAfterFailover,
+ final boolean useDuplicateDetection,
final List<Pair<TransportConfiguration, TransportConfiguration>> connectors) throws Exception
{
this.name = name;
@@ -154,6 +157,8 @@
this.maxRetriesBeforeFailover = maxRetriesBeforeFailover;
this.maxRetriesAfterFailover = maxRetriesAfterFailover;
+
+ this.useDuplicateDetection = useDuplicateDetection;
this.updateConnectors(connectors);
}
@@ -177,6 +182,7 @@
final double retryIntervalMultiplier,
final int maxRetriesBeforeFailover,
final int maxRetriesAfterFailover,
+ final boolean useDuplicateDetection,
final DiscoveryGroup discoveryGroup) throws Exception
{
this.name = name;
@@ -212,6 +218,8 @@
this.maxRetriesBeforeFailover = maxRetriesBeforeFailover;
this.maxRetriesAfterFailover = maxRetriesAfterFailover;
+
+ this.useDuplicateDetection = useDuplicateDetection;
}
public synchronized void start() throws Exception
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/BasicMessageFlowTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/BasicMessageFlowTest.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/BasicMessageFlowTest.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -26,6 +26,7 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_RETRIES_BEFORE_FAILOVER;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
+import static org.jboss.messaging.core.config.impl.ConfigurationImpl.DEFAULT_USE_DUPLICATE_DETECTION;
import java.util.ArrayList;
import java.util.HashMap;
@@ -42,6 +43,7 @@
import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.cluster.MessageFlowConfiguration;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
import org.jboss.messaging.core.server.MessagingService;
@@ -107,6 +109,7 @@
DEFAULT_RETRY_INTERVAL_MULTIPLIER,
DEFAULT_MAX_RETRIES_BEFORE_FAILOVER,
DEFAULT_MAX_RETRIES_AFTER_FAILOVER,
+ DEFAULT_USE_DUPLICATE_DETECTION,
connectorNames);
MessageFlowConfiguration ofconfig2 = new MessageFlowConfiguration("flow1",
address1.toString(),
@@ -119,6 +122,7 @@
DEFAULT_RETRY_INTERVAL_MULTIPLIER,
DEFAULT_MAX_RETRIES_BEFORE_FAILOVER,
DEFAULT_MAX_RETRIES_AFTER_FAILOVER,
+ DEFAULT_USE_DUPLICATE_DETECTION,
connectorNames);
Set<MessageFlowConfiguration> ofconfigs = new HashSet<MessageFlowConfiguration>();
@@ -210,6 +214,7 @@
DEFAULT_RETRY_INTERVAL_MULTIPLIER,
DEFAULT_MAX_RETRIES_BEFORE_FAILOVER,
DEFAULT_MAX_RETRIES_AFTER_FAILOVER,
+ DEFAULT_USE_DUPLICATE_DETECTION,
connectorNames);
Set<MessageFlowConfiguration> ofconfigs = new HashSet<MessageFlowConfiguration>();
@@ -288,6 +293,7 @@
DEFAULT_RETRY_INTERVAL_MULTIPLIER,
DEFAULT_MAX_RETRIES_BEFORE_FAILOVER,
DEFAULT_MAX_RETRIES_AFTER_FAILOVER,
+ DEFAULT_USE_DUPLICATE_DETECTION,
connectorNames);
Set<MessageFlowConfiguration> ofconfigs = new HashSet<MessageFlowConfiguration>();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/DiscoveryFlowTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/DiscoveryFlowTest.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/DiscoveryFlowTest.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -26,6 +26,7 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_RETRIES_BEFORE_FAILOVER;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
+import static org.jboss.messaging.core.config.impl.ConfigurationImpl.DEFAULT_USE_DUPLICATE_DETECTION;
import java.util.ArrayList;
import java.util.HashMap;
@@ -202,6 +203,7 @@
DEFAULT_RETRY_INTERVAL_MULTIPLIER,
DEFAULT_MAX_RETRIES_BEFORE_FAILOVER,
DEFAULT_MAX_RETRIES_AFTER_FAILOVER,
+ DEFAULT_USE_DUPLICATE_DETECTION,
discoveryGroupName);
Set<MessageFlowConfiguration> ofconfigs = new HashSet<MessageFlowConfiguration>();
ofconfigs.add(ofconfig);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowBatchSizeTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowBatchSizeTest.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowBatchSizeTest.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -26,6 +26,7 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_RETRIES_BEFORE_FAILOVER;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
+import static org.jboss.messaging.core.config.impl.ConfigurationImpl.DEFAULT_USE_DUPLICATE_DETECTION;
import java.util.ArrayList;
import java.util.HashMap;
@@ -106,6 +107,7 @@
DEFAULT_RETRY_INTERVAL_MULTIPLIER,
DEFAULT_MAX_RETRIES_BEFORE_FAILOVER,
DEFAULT_MAX_RETRIES_AFTER_FAILOVER,
+ DEFAULT_USE_DUPLICATE_DETECTION,
connectorNames);
Set<MessageFlowConfiguration> ofconfigs = new HashSet<MessageFlowConfiguration>();
ofconfigs.add(ofconfig);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowBatchTimeTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowBatchTimeTest.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowBatchTimeTest.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -26,6 +26,7 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_RETRIES_BEFORE_FAILOVER;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
+import static org.jboss.messaging.core.config.impl.ConfigurationImpl.DEFAULT_USE_DUPLICATE_DETECTION;
import java.util.ArrayList;
import java.util.HashMap;
@@ -107,6 +108,7 @@
DEFAULT_RETRY_INTERVAL_MULTIPLIER,
DEFAULT_MAX_RETRIES_BEFORE_FAILOVER,
DEFAULT_MAX_RETRIES_AFTER_FAILOVER,
+ DEFAULT_USE_DUPLICATE_DETECTION,
connectorNames);
Set<MessageFlowConfiguration> ofconfigs = new HashSet<MessageFlowConfiguration>();
ofconfigs.add(ofconfig);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowReconnectTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowReconnectTest.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowReconnectTest.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -22,6 +22,8 @@
package org.jboss.messaging.tests.integration.cluster.distribution;
+import static org.jboss.messaging.core.config.impl.ConfigurationImpl.DEFAULT_USE_DUPLICATE_DETECTION;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -129,6 +131,7 @@
retryIntervalMultiplier,
retriesBeforeFailover,
maxRetriesAfterFailover,
+ DEFAULT_USE_DUPLICATE_DETECTION,
connectorNames);
Set<MessageFlowConfiguration> ofconfigs = new HashSet<MessageFlowConfiguration>();
@@ -259,6 +262,7 @@
retryIntervalMultiplier,
retriesBeforeFailover,
maxRetriesAfterFailover,
+ DEFAULT_USE_DUPLICATE_DETECTION,
connectorNames);
Set<MessageFlowConfiguration> ofconfigs = new HashSet<MessageFlowConfiguration>();
@@ -393,6 +397,7 @@
retryIntervalMultiplier,
retriesBeforeFailover,
maxRetriesAfterFailover,
+ DEFAULT_USE_DUPLICATE_DETECTION,
connectorNames);
Set<MessageFlowConfiguration> ofconfigs = new HashSet<MessageFlowConfiguration>();
@@ -513,6 +518,7 @@
retryIntervalMultiplier,
retriesBeforeFailover,
maxRetriesAfterFailover,
+ DEFAULT_USE_DUPLICATE_DETECTION,
connectorNames);
Set<MessageFlowConfiguration> ofconfigs = new HashSet<MessageFlowConfiguration>();
@@ -622,6 +628,7 @@
retryIntervalMultiplier,
retriesBeforeFailover,
maxRetriesAfterFailover,
+ DEFAULT_USE_DUPLICATE_DETECTION,
connectorNames);
Set<MessageFlowConfiguration> ofconfigs = new HashSet<MessageFlowConfiguration>();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowTransformerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowTransformerTest.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowTransformerTest.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -26,6 +26,7 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_RETRIES_BEFORE_FAILOVER;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
+import static org.jboss.messaging.core.config.impl.ConfigurationImpl.DEFAULT_USE_DUPLICATE_DETECTION;
import java.util.ArrayList;
import java.util.HashMap;
@@ -104,6 +105,7 @@
DEFAULT_RETRY_INTERVAL_MULTIPLIER,
DEFAULT_MAX_RETRIES_BEFORE_FAILOVER,
DEFAULT_MAX_RETRIES_AFTER_FAILOVER,
+ DEFAULT_USE_DUPLICATE_DETECTION,
connectorNames);
Set<MessageFlowConfiguration> ofconfigs = new HashSet<MessageFlowConfiguration>();
ofconfigs.add(ofconfig);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowWildcardTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowWildcardTest.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowWildcardTest.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -26,6 +26,7 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_RETRIES_BEFORE_FAILOVER;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
+import static org.jboss.messaging.core.config.impl.ConfigurationImpl.DEFAULT_USE_DUPLICATE_DETECTION;
import java.util.ArrayList;
import java.util.HashMap;
@@ -112,6 +113,7 @@
DEFAULT_RETRY_INTERVAL_MULTIPLIER,
DEFAULT_MAX_RETRIES_BEFORE_FAILOVER,
DEFAULT_MAX_RETRIES_AFTER_FAILOVER,
+ DEFAULT_USE_DUPLICATE_DETECTION,
connectorNames);
Set<MessageFlowConfiguration> ofconfigs = new HashSet<MessageFlowConfiguration>();
ofconfigs.add(ofconfig);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowWithFilterTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowWithFilterTest.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageFlowWithFilterTest.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -26,6 +26,7 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_RETRIES_BEFORE_FAILOVER;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
+import static org.jboss.messaging.core.config.impl.ConfigurationImpl.DEFAULT_USE_DUPLICATE_DETECTION;
import java.util.ArrayList;
import java.util.HashMap;
@@ -106,6 +107,7 @@
DEFAULT_RETRY_INTERVAL_MULTIPLIER,
DEFAULT_MAX_RETRIES_BEFORE_FAILOVER,
DEFAULT_MAX_RETRIES_AFTER_FAILOVER,
+ DEFAULT_USE_DUPLICATE_DETECTION,
connectorNames);
Set<MessageFlowConfiguration> ofconfigs = new HashSet<MessageFlowConfiguration>();
ofconfigs.add(ofconfig);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/StaticFlowTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/StaticFlowTest.java 2008-12-10 15:58:26 UTC (rev 5506)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/StaticFlowTest.java 2008-12-10 18:12:09 UTC (rev 5507)
@@ -26,6 +26,7 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_RETRIES_BEFORE_FAILOVER;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
+import static org.jboss.messaging.core.config.impl.ConfigurationImpl.DEFAULT_USE_DUPLICATE_DETECTION;
import java.util.ArrayList;
import java.util.HashMap;
@@ -136,6 +137,7 @@
DEFAULT_RETRY_INTERVAL_MULTIPLIER,
DEFAULT_MAX_RETRIES_BEFORE_FAILOVER,
DEFAULT_MAX_RETRIES_AFTER_FAILOVER,
+ DEFAULT_USE_DUPLICATE_DETECTION,
connectorNames);
Set<MessageFlowConfiguration> ofconfigs = new HashSet<MessageFlowConfiguration>();
ofconfigs.add(ofconfig);
@@ -301,6 +303,7 @@
DEFAULT_RETRY_INTERVAL_MULTIPLIER,
DEFAULT_MAX_RETRIES_BEFORE_FAILOVER,
DEFAULT_MAX_RETRIES_AFTER_FAILOVER,
+ DEFAULT_USE_DUPLICATE_DETECTION,
connectorNames);
Set<MessageFlowConfiguration> ofconfigs = new HashSet<MessageFlowConfiguration>();
ofconfigs.add(ofconfig);
@@ -481,6 +484,7 @@
DEFAULT_RETRY_INTERVAL_MULTIPLIER,
DEFAULT_MAX_RETRIES_BEFORE_FAILOVER,
DEFAULT_MAX_RETRIES_AFTER_FAILOVER,
+ DEFAULT_USE_DUPLICATE_DETECTION,
connectorNames1);
MessageFlowConfiguration ofconfig2 = new MessageFlowConfiguration("flow2",
testAddress.toString(),
@@ -493,6 +497,7 @@
DEFAULT_RETRY_INTERVAL_MULTIPLIER,
DEFAULT_MAX_RETRIES_BEFORE_FAILOVER,
DEFAULT_MAX_RETRIES_AFTER_FAILOVER,
+ DEFAULT_USE_DUPLICATE_DETECTION,
connectorNames2);
MessageFlowConfiguration ofconfig3 = new MessageFlowConfiguration("flow3",
testAddress.toString(),
@@ -505,6 +510,7 @@
DEFAULT_RETRY_INTERVAL_MULTIPLIER,
DEFAULT_MAX_RETRIES_BEFORE_FAILOVER,
DEFAULT_MAX_RETRIES_AFTER_FAILOVER,
+ DEFAULT_USE_DUPLICATE_DETECTION,
connectorNames3);
MessageFlowConfiguration ofconfig4 = new MessageFlowConfiguration("flow4",
testAddress.toString(),
@@ -517,6 +523,7 @@
DEFAULT_RETRY_INTERVAL_MULTIPLIER,
DEFAULT_MAX_RETRIES_BEFORE_FAILOVER,
DEFAULT_MAX_RETRIES_AFTER_FAILOVER,
+ DEFAULT_USE_DUPLICATE_DETECTION,
connectorNames4);
Set<MessageFlowConfiguration> ofconfigs = new HashSet<MessageFlowConfiguration>();
More information about the jboss-cvs-commits
mailing list