JBoss hornetq SVN: r11683 - in trunk/hornetq-core/src/main/java/org/hornetq: core/deployers/impl and 4 other directories.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-11-10 06:07:28 -0500 (Thu, 10 Nov 2011)
New Revision: 11683
Modified:
trunk/hornetq-core/src/main/java/org/hornetq/api/core/DiscoveryGroupConfiguration.java
trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/SecurityDeployer.java
trunk/hornetq-core/src/main/java/org/hornetq/core/paging/PagedMessage.java
trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/PagedReferenceImpl.java
trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PageImpl.java
trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PageSyncTimer.java
trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PagedMessageImpl.java
trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java
Log:
clean up
Modified: trunk/hornetq-core/src/main/java/org/hornetq/api/core/DiscoveryGroupConfiguration.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/api/core/DiscoveryGroupConfiguration.java 2011-11-09 19:10:14 UTC (rev 11682)
+++ trunk/hornetq-core/src/main/java/org/hornetq/api/core/DiscoveryGroupConfiguration.java 2011-11-10 11:07:28 UTC (rev 11683)
@@ -16,7 +16,6 @@
import java.io.Serializable;
import org.hornetq.api.core.client.HornetQClient;
-import org.hornetq.core.logging.Logger;
import org.hornetq.utils.UUIDGenerator;
/**
@@ -32,9 +31,6 @@
{
private static final long serialVersionUID = 8657206421727863400L;
- private static final Logger log = Logger.getLogger(DiscoveryGroupConfiguration.class);
-
-
private String name;
private String localBindAddress;
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/SecurityDeployer.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/SecurityDeployer.java 2011-11-09 19:10:14 UTC (rev 11682)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/SecurityDeployer.java 2011-11-10 11:07:28 UTC (rev 11683)
@@ -35,7 +35,7 @@
private static final String MATCH = "match";
- private final FileConfigurationParser parser = new FileConfigurationParser();
+ private final FileConfigurationParser parser = new FileConfigurationParser();
/**
* The repository to add to
@@ -68,8 +68,7 @@
}
/**
- * the key attribute for theelement, usually 'name' but can be overridden
- *
+ * the key attribute for the element, usually 'name' but can be overridden
* @return the key attribute
*/
@Override
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/PagedMessage.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/PagedMessage.java 2011-11-09 19:10:14 UTC (rev 11682)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/PagedMessage.java 2011-11-10 11:07:28 UTC (rev 11683)
@@ -18,21 +18,19 @@
import org.hornetq.core.server.ServerMessage;
/**
- *
- * A Paged message
- *
- * We can't just record the ServerMessage as we need other information (such as the TransactionID used during paging)
- *
+ * A Paged message.
+ * <p>
+ * We can't just record the ServerMessage as we need other information (such as the TransactionID
+ * used during paging)
* @author <a href="mailto:clebert.suconic@jboss.com">Clebert Suconic</a>
- *
*/
public interface PagedMessage extends EncodingSupport
{
ServerMessage getMessage();
-
+
/** The queues that were routed during paging */
long[] getQueueIDs();
-
+
void initMessage(StorageManager storageManager);
long getTransactionID();
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/PagedReferenceImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/PagedReferenceImpl.java 2011-11-09 19:10:14 UTC (rev 11682)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/PagedReferenceImpl.java 2011-11-10 11:07:28 UTC (rev 11683)
@@ -33,9 +33,6 @@
*/
public class PagedReferenceImpl implements PagedReference
{
-
- private static final long serialVersionUID = -8640232251318264710L;
-
private static final Logger log = Logger.getLogger(PagedReferenceImpl.class);
private static final boolean isTrace = log.isTraceEnabled();
@@ -50,7 +47,7 @@
private int messageEstimate;
- private AtomicInteger deliveryCount = new AtomicInteger(0);
+ private final AtomicInteger deliveryCount = new AtomicInteger(0);
private final PageSubscription subscription;
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PageImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PageImpl.java 2011-11-09 19:10:14 UTC (rev 11682)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PageImpl.java 2011-11-10 11:07:28 UTC (rev 11683)
@@ -41,7 +41,7 @@
// Constants -----------------------------------------------------
private static final Logger log = Logger.getLogger(PageImpl.class);
-
+
private static final boolean isTrace = log.isTraceEnabled();
private static final boolean isDebug = log.isDebugEnabled();
@@ -111,7 +111,7 @@
{
log.debug("reading page " + this.pageId + " on address = " + storeName);
}
-
+
ArrayList<PagedMessage> messages = new ArrayList<PagedMessage>();
size.set((int)file.size());
@@ -238,7 +238,7 @@
{
storageManager.pageDeleted(storeName, pageId);
}
-
+
if (isDebug)
{
log.debug("Deleting pageId=" + pageId + " on store " + storeName);
@@ -301,18 +301,11 @@
}
- /* (non-Javadoc)
- * @see java.lang.Comparable#compareTo(java.lang.Object)
- */
public int compareTo(Page otherPage)
{
return otherPage.getPageId() - this.pageId;
}
-
- /* (non-Javadoc)
- * @see java.lang.Object#hashCode()
- */
@Override
public int hashCode()
{
@@ -322,16 +315,6 @@
return result;
}
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
@Override
public boolean equals(Object obj)
{
@@ -347,6 +330,12 @@
return true;
}
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
/**
* @param position
* @param msgNumber
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PageSyncTimer.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PageSyncTimer.java 2011-11-09 19:10:14 UTC (rev 11682)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PageSyncTimer.java 2011-11-10 11:07:28 UTC (rev 11683)
@@ -19,7 +19,6 @@
import java.util.concurrent.TimeUnit;
import org.hornetq.api.core.HornetQException;
-import org.hornetq.core.logging.Logger;
import org.hornetq.core.paging.PagingStore;
import org.hornetq.core.persistence.OperationContext;
@@ -35,9 +34,6 @@
// Constants -----------------------------------------------------
- private static final Logger log = Logger.getLogger(PageSyncTimer.class);
-
-
// Attributes ----------------------------------------------------
private final PagingStore store;
@@ -56,7 +52,7 @@
}
};
- private List<OperationContext> syncOperations = new LinkedList<OperationContext>();
+ private final List<OperationContext> syncOperations = new LinkedList<OperationContext>();
// Static --------------------------------------------------------
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PagedMessageImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PagedMessageImpl.java 2011-11-09 19:10:14 UTC (rev 11682)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PagedMessageImpl.java 2011-11-10 11:07:28 UTC (rev 11683)
@@ -163,9 +163,6 @@
DataConstants.SIZE_INT + queueIDs.length * DataConstants.SIZE_LONG;
}
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
@Override
public String toString()
{
@@ -176,9 +173,9 @@
message +
"]";
}
-
-
+
+
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java 2011-11-09 19:10:14 UTC (rev 11682)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java 2011-11-10 11:07:28 UTC (rev 11683)
@@ -83,12 +83,4 @@
return journalID;
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
13 years, 1 month
JBoss hornetq SVN: r11682 - branches/Branch_2_2_AS7/src/main/org/hornetq/core/client/impl.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-11-09 14:10:14 -0500 (Wed, 09 Nov 2011)
New Revision: 11682
Modified:
branches/Branch_2_2_AS7/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
Log:
just fixing a log statement
Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
===================================================================
--- branches/Branch_2_2_AS7/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-11-09 18:52:15 UTC (rev 11681)
+++ branches/Branch_2_2_AS7/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-11-09 19:10:14 UTC (rev 11682)
@@ -609,10 +609,12 @@
public ClientSessionFactory createSessionFactory(String nodeID) throws Exception
{
- log.trace(topology.describe("full topology"));
TopologyMember topologyMember = topology.getMember(nodeID);
- log.trace("Creating connection factory towards " + nodeID + " = " + topologyMember);
+ if (log.isTraceEnabled())
+ {
+ log.trace("Creating connection factory towards " + nodeID + " = " + topologyMember + ", topology=" + topology.describe());
+ }
if (topologyMember == null)
{
13 years, 1 month
JBoss hornetq SVN: r11681 - branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-11-09 13:52:15 -0500 (Wed, 09 Nov 2011)
New Revision: 11681
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
Log:
Removing excessive log on ServerLocator
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-11-09 18:45:28 UTC (rev 11680)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-11-09 18:52:15 UTC (rev 11681)
@@ -609,10 +609,12 @@
public ClientSessionFactory createSessionFactory(String nodeID) throws Exception
{
- log.info(topology.describe("full topology"));
TopologyMember topologyMember = topology.getMember(nodeID);
- log.info("Creating connection factory towards " + nodeID + " = " + topologyMember);
+ if (log.isTraceEnabled())
+ {
+ log.trace("Creating connection factory towards " + nodeID + " = " + topologyMember + ", topology=" + topology.describe());
+ }
if (topologyMember == null)
{
@@ -662,8 +664,17 @@
addToConnecting(factory);
try
{
- factory.connect(reconnectAttempts, failoverOnInitialConnection);
- addFactory(factory);
+ try
+ {
+ factory.connect(reconnectAttempts, failoverOnInitialConnection);
+ }
+ catch (HornetQException e1)
+ {
+ //we need to make sure is closed just for garbage collection
+ factory.close();
+ throw e1;
+ }
+ addFactory(factory);
return factory;
}
finally
13 years, 1 month
JBoss hornetq SVN: r11680 - branches/Branch_2_2_EAP/src/main/org/hornetq/core/config.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-11-09 13:45:28 -0500 (Wed, 09 Nov 2011)
New Revision: 11680
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/BridgeConfiguration.java
Log:
Adding a new constructor for being compatible on the API
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-11-09 14:48:11 UTC (rev 11679)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/BridgeConfiguration.java 2011-11-09 18:45:28 UTC (rev 11680)
@@ -16,6 +16,8 @@
import java.io.Serializable;
import java.util.List;
+import org.hornetq.api.core.client.HornetQClient;
+
/**
* A BridgeConfiguration
*
@@ -40,7 +42,7 @@
private List<String> staticConnectors;
private String discoveryGroupName;
-
+
private boolean ha;
private String transformerClassName;
@@ -56,17 +58,55 @@
private int confirmationWindowSize;
private final long clientFailureCheckPeriod;
-
+
private String user;
-
+
private String password;
private final long connectionTTL;
-
+
private final long maxRetryInterval;
-
+
private final int minLargeMessageSize;
+ /**
+ * For backward compatibility on the API... no MinLargeMessage on this constructor
+ */
+ public BridgeConfiguration(final String name,
+ final String queueName,
+ final String forwardingAddress,
+ final String filterString,
+ final String transformerClassName,
+ final long retryInterval,
+ final double retryIntervalMultiplier,
+ final int reconnectAttempts,
+ final boolean useDuplicateDetection,
+ final int confirmationWindowSize,
+ final long clientFailureCheckPeriod,
+ final List<String> staticConnectors,
+ final boolean ha,
+ final String user,
+ final String password)
+ {
+ this(name,
+ queueName,
+ forwardingAddress,
+ filterString,
+ transformerClassName,
+ HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
+ clientFailureCheckPeriod,
+ HornetQClient.DEFAULT_CONNECTION_TTL,
+ retryInterval,
+ retryInterval,
+ retryIntervalMultiplier,
+ reconnectAttempts,
+ useDuplicateDetection,
+ confirmationWindowSize,
+ staticConnectors,
+ ha,
+ user,
+ password);
+ }
public BridgeConfiguration(final String name,
final String queueName,
@@ -100,13 +140,53 @@
this.confirmationWindowSize = confirmationWindowSize;
this.clientFailureCheckPeriod = clientFailureCheckPeriod;
this.staticConnectors = staticConnectors;
- this. user = user;
+ this.user = user;
this.password = password;
this.connectionTTL = connectionTTL;
this.maxRetryInterval = maxRetryInterval;
discoveryGroupName = null;
}
+ /**
+ * For backward compatibility on the API... no MinLareMessage, checkPeriod and TTL on this constructor
+ */
+
+ public BridgeConfiguration(final String name,
+ final String queueName,
+ final String forwardingAddress,
+ final String filterString,
+ final String transformerClassName,
+ final long retryInterval,
+ final double retryIntervalMultiplier,
+ final int reconnectAttempts,
+ final boolean useDuplicateDetection,
+ final int confirmationWindowSize,
+ final long clientFailureCheckPeriod,
+ final String discoveryGroupName,
+ final boolean ha,
+ final String user,
+ final String password)
+ {
+ this(name,
+ queueName,
+ forwardingAddress,
+ filterString,
+ transformerClassName,
+ HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
+ clientFailureCheckPeriod,
+ HornetQClient.DEFAULT_CONNECTION_TTL,
+ retryInterval,
+ retryInterval,
+ retryIntervalMultiplier,
+ reconnectAttempts,
+ useDuplicateDetection,
+ confirmationWindowSize,
+ discoveryGroupName,
+ ha,
+ user,
+ password);
+ }
+
public BridgeConfiguration(final String name,
final String queueName,
final String forwardingAddress,
@@ -197,7 +277,7 @@
{
return discoveryGroupName;
}
-
+
public boolean isHA()
{
return ha;
@@ -288,7 +368,7 @@
{
this.discoveryGroupName = discoveryGroupName;
}
-
+
/**
*
* @param ha is the bridge supporting HA?
13 years, 1 month
JBoss hornetq SVN: r11679 - trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-11-09 09:48:11 -0500 (Wed, 09 Nov 2011)
New Revision: 11679
Modified:
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java
Log:
All tests in the testcase require an up-to-date backup.
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java 2011-11-09 14:36:50 UTC (rev 11678)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java 2011-11-09 14:48:11 UTC (rev 11679)
@@ -139,7 +139,10 @@
backupServer = new HornetQServerImpl(backupConfig);
locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(INVM_CONNECTOR_FACTORY));
backupServer.start();
- waitForComponent(backupServer);
+ if (backup)
+ {
+ FailoverTestBase.waitForBackup(null, 5, true, backupServer);
+ }
int count = 0;
waitForReplication(count);
}
@@ -209,7 +212,7 @@
blockOnReplication(storage, manager);
- Assert.assertEquals(0, manager.getActiveTokens().size());
+ Assert.assertTrue("Expecting no active tokens:" + manager.getActiveTokens(), manager.getActiveTokens().isEmpty());
ServerMessage msg = new ServerMessageImpl(1, 1024);
@@ -433,7 +436,6 @@
StorageManager storage = getStorage();
manager = liveServer.getReplicationManager();
waitForComponent(manager);
- FailoverTestBase.waitForBackup(null, 5, true, backupServer);
Journal replicatedJournal = new ReplicatedJournal((byte)1, new FakeJournal(), manager);
13 years, 1 month
JBoss hornetq SVN: r11678 - branches/Branch_2_2_AS7/src/main/org/hornetq/core/client/impl.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-11-09 09:36:50 -0500 (Wed, 09 Nov 2011)
New Revision: 11678
Modified:
branches/Branch_2_2_AS7/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
Log:
fix for closing non connected csf
Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
===================================================================
--- branches/Branch_2_2_AS7/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-11-09 10:01:40 UTC (rev 11677)
+++ branches/Branch_2_2_AS7/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-11-09 14:36:50 UTC (rev 11678)
@@ -662,8 +662,17 @@
addToConnecting(factory);
try
{
- factory.connect(reconnectAttempts, failoverOnInitialConnection);
- addFactory(factory);
+ try
+ {
+ factory.connect(reconnectAttempts, failoverOnInitialConnection);
+ }
+ catch (HornetQException e1)
+ {
+ //we need to make sure is closed just for garbage collection
+ factory.close();
+ throw e1;
+ }
+ addFactory(factory);
return factory;
}
finally
@@ -675,7 +684,6 @@
private void removeFromConnecting(ClientSessionFactoryInternal factory)
{
connectingFactories.remove(factory);
- factory.close();
}
private void addToConnecting(ClientSessionFactoryInternal factory)
13 years, 1 month
JBoss hornetq SVN: r11677 - branches/Branch_2_2_AS7/src/main/org/hornetq/core/client/impl.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-11-09 05:01:40 -0500 (Wed, 09 Nov 2011)
New Revision: 11677
Modified:
branches/Branch_2_2_AS7/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
Log:
updated debug and close factory on failed connect
Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
===================================================================
--- branches/Branch_2_2_AS7/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-11-08 20:45:22 UTC (rev 11676)
+++ branches/Branch_2_2_AS7/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-11-09 10:01:40 UTC (rev 11677)
@@ -609,10 +609,10 @@
public ClientSessionFactory createSessionFactory(String nodeID) throws Exception
{
- log.info(topology.describe("full topology"));
+ log.trace(topology.describe("full topology"));
TopologyMember topologyMember = topology.getMember(nodeID);
- log.info("Creating connection factory towards " + nodeID + " = " + topologyMember);
+ log.trace("Creating connection factory towards " + nodeID + " = " + topologyMember);
if (topologyMember == null)
{
@@ -675,6 +675,7 @@
private void removeFromConnecting(ClientSessionFactoryInternal factory)
{
connectingFactories.remove(factory);
+ factory.close();
}
private void addToConnecting(ClientSessionFactoryInternal factory)
13 years, 1 month
JBoss hornetq SVN: r11676 - branches/Branch_2_2_AS7/src/main/org/hornetq/core/config.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-11-08 15:45:22 -0500 (Tue, 08 Nov 2011)
New Revision: 11676
Modified:
branches/Branch_2_2_AS7/src/main/org/hornetq/core/config/BridgeConfiguration.java
Log:
Adding a constructor for backward compatibility on the API
Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/core/config/BridgeConfiguration.java
===================================================================
--- branches/Branch_2_2_AS7/src/main/org/hornetq/core/config/BridgeConfiguration.java 2011-11-08 20:29:05 UTC (rev 11675)
+++ branches/Branch_2_2_AS7/src/main/org/hornetq/core/config/BridgeConfiguration.java 2011-11-08 20:45:22 UTC (rev 11676)
@@ -82,6 +82,7 @@
final int reconnectAttempts,
final boolean useDuplicateDetection,
final int confirmationWindowSize,
+ final long clientFailureCheckPeriod,
final List<String> staticConnectors,
final boolean ha,
final String user,
@@ -93,7 +94,7 @@
filterString,
transformerClassName,
HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
- HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
+ clientFailureCheckPeriod,
HornetQClient.DEFAULT_CONNECTION_TTL,
retryInterval,
retryInterval,
@@ -148,8 +149,9 @@
/**
* For backward compatibility on the API... no MinLareMessage, checkPeriod and TTL on this constructor
- */
- public BridgeConfiguration(final String name,
+ */
+
+ public BridgeConfiguration(final String name,
final String queueName,
final String forwardingAddress,
final String filterString,
@@ -159,6 +161,7 @@
final int reconnectAttempts,
final boolean useDuplicateDetection,
final int confirmationWindowSize,
+ final long clientFailureCheckPeriod,
final String discoveryGroupName,
final boolean ha,
final String user,
@@ -170,7 +173,7 @@
filterString,
transformerClassName,
HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
- HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
+ clientFailureCheckPeriod,
HornetQClient.DEFAULT_CONNECTION_TTL,
retryInterval,
retryInterval,
13 years, 1 month
JBoss hornetq SVN: r11675 - branches/Branch_2_2_AS7/src/main/org/hornetq/core/config.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-11-08 15:29:05 -0500 (Tue, 08 Nov 2011)
New Revision: 11675
Modified:
branches/Branch_2_2_AS7/src/main/org/hornetq/core/config/BridgeConfiguration.java
Log:
Adding a constructor for backward compatibility on the API
Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/core/config/BridgeConfiguration.java
===================================================================
--- branches/Branch_2_2_AS7/src/main/org/hornetq/core/config/BridgeConfiguration.java 2011-11-08 18:45:20 UTC (rev 11674)
+++ branches/Branch_2_2_AS7/src/main/org/hornetq/core/config/BridgeConfiguration.java 2011-11-08 20:29:05 UTC (rev 11675)
@@ -70,7 +70,7 @@
private final int minLargeMessageSize;
/**
- * For backward compatibility on the API... no MinLareMessage on this constructor
+ * For backward compatibility on the API... no MinLargeMessage on this constructor
*/
public BridgeConfiguration(final String name,
final String queueName,
@@ -78,7 +78,6 @@
final String filterString,
final String transformerClassName,
final long retryInterval,
- final long maxRetryInterval,
final double retryIntervalMultiplier,
final int reconnectAttempts,
final boolean useDuplicateDetection,
@@ -97,7 +96,7 @@
HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
HornetQClient.DEFAULT_CONNECTION_TTL,
retryInterval,
- maxRetryInterval,
+ retryInterval,
retryIntervalMultiplier,
reconnectAttempts,
useDuplicateDetection,
@@ -156,7 +155,6 @@
final String filterString,
final String transformerClassName,
final long retryInterval,
- final long maxRetryInterval,
final double retryIntervalMultiplier,
final int reconnectAttempts,
final boolean useDuplicateDetection,
@@ -175,7 +173,7 @@
HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
HornetQClient.DEFAULT_CONNECTION_TTL,
retryInterval,
- maxRetryInterval,
+ retryInterval,
retryIntervalMultiplier,
reconnectAttempts,
useDuplicateDetection,
13 years, 1 month
JBoss hornetq SVN: r11674 - branches/Branch_2_2_AS7/src/main/org/hornetq/core/config.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-11-08 13:45:20 -0500 (Tue, 08 Nov 2011)
New Revision: 11674
Modified:
branches/Branch_2_2_AS7/src/main/org/hornetq/core/config/BridgeConfiguration.java
Log:
Adding a constructor for backward compatibility on the API
Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/core/config/BridgeConfiguration.java
===================================================================
--- branches/Branch_2_2_AS7/src/main/org/hornetq/core/config/BridgeConfiguration.java 2011-11-08 16:33:21 UTC (rev 11673)
+++ branches/Branch_2_2_AS7/src/main/org/hornetq/core/config/BridgeConfiguration.java 2011-11-08 18:45:20 UTC (rev 11674)
@@ -16,6 +16,8 @@
import java.io.Serializable;
import java.util.List;
+import org.hornetq.api.core.client.HornetQClient;
+
/**
* A BridgeConfiguration
*
@@ -40,7 +42,7 @@
private List<String> staticConnectors;
private String discoveryGroupName;
-
+
private boolean ha;
private String transformerClassName;
@@ -56,17 +58,55 @@
private int confirmationWindowSize;
private final long clientFailureCheckPeriod;
-
+
private String user;
-
+
private String password;
private final long connectionTTL;
-
+
private final long maxRetryInterval;
-
+
private final int minLargeMessageSize;
+ /**
+ * For backward compatibility on the API... no MinLareMessage on this constructor
+ */
+ public BridgeConfiguration(final String name,
+ final String queueName,
+ final String forwardingAddress,
+ final String filterString,
+ final String transformerClassName,
+ final long retryInterval,
+ final long maxRetryInterval,
+ final double retryIntervalMultiplier,
+ final int reconnectAttempts,
+ final boolean useDuplicateDetection,
+ final int confirmationWindowSize,
+ final List<String> staticConnectors,
+ final boolean ha,
+ final String user,
+ final String password)
+ {
+ this(name,
+ queueName,
+ forwardingAddress,
+ filterString,
+ transformerClassName,
+ HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
+ HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
+ HornetQClient.DEFAULT_CONNECTION_TTL,
+ retryInterval,
+ maxRetryInterval,
+ retryIntervalMultiplier,
+ reconnectAttempts,
+ useDuplicateDetection,
+ confirmationWindowSize,
+ staticConnectors,
+ ha,
+ user,
+ password);
+ }
public BridgeConfiguration(final String name,
final String queueName,
@@ -100,18 +140,57 @@
this.confirmationWindowSize = confirmationWindowSize;
this.clientFailureCheckPeriod = clientFailureCheckPeriod;
this.staticConnectors = staticConnectors;
- this. user = user;
+ this.user = user;
this.password = password;
this.connectionTTL = connectionTTL;
this.maxRetryInterval = maxRetryInterval;
discoveryGroupName = null;
}
+ /**
+ * For backward compatibility on the API... no MinLareMessage, checkPeriod and TTL on this constructor
+ */
public BridgeConfiguration(final String name,
final String queueName,
final String forwardingAddress,
final String filterString,
final String transformerClassName,
+ final long retryInterval,
+ final long maxRetryInterval,
+ final double retryIntervalMultiplier,
+ final int reconnectAttempts,
+ final boolean useDuplicateDetection,
+ final int confirmationWindowSize,
+ final String discoveryGroupName,
+ final boolean ha,
+ final String user,
+ final String password)
+ {
+ this(name,
+ queueName,
+ forwardingAddress,
+ filterString,
+ transformerClassName,
+ HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
+ HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
+ HornetQClient.DEFAULT_CONNECTION_TTL,
+ retryInterval,
+ maxRetryInterval,
+ retryIntervalMultiplier,
+ reconnectAttempts,
+ useDuplicateDetection,
+ confirmationWindowSize,
+ discoveryGroupName,
+ ha,
+ user,
+ password);
+ }
+
+ public BridgeConfiguration(final String name,
+ final String queueName,
+ final String forwardingAddress,
+ final String filterString,
+ final String transformerClassName,
final int minLargeMessageSize,
final long clientFailureCheckPeriod,
final long connectionTTL,
@@ -197,7 +276,7 @@
{
return discoveryGroupName;
}
-
+
public boolean isHA()
{
return ha;
@@ -288,7 +367,7 @@
{
this.discoveryGroupName = discoveryGroupName;
}
-
+
/**
*
* @param ha is the bridge supporting HA?
13 years, 1 month