[jboss-cvs] JBoss Messaging SVN: r5805 - in branches/Branch_1416_merge/src/main/org/jboss/jms: client/delegate and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 4 06:28:46 EST 2009
Author: gaohoward
Date: 2009-02-04 06:28:46 -0500 (Wed, 04 Feb 2009)
New Revision: 5805
Modified:
branches/Branch_1416_merge/src/main/org/jboss/jms/client/container/ProducerAspect.java
branches/Branch_1416_merge/src/main/org/jboss/jms/client/container/StateCreationAspect.java
branches/Branch_1416_merge/src/main/org/jboss/jms/client/delegate/ClientClusteredConnectionFactoryDelegate.java
branches/Branch_1416_merge/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
branches/Branch_1416_merge/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java
branches/Branch_1416_merge/src/main/org/jboss/jms/client/state/ConnectionState.java
branches/Branch_1416_merge/src/main/org/jboss/jms/client/state/ProducerState.java
branches/Branch_1416_merge/src/main/org/jboss/jms/client/state/SessionState.java
branches/Branch_1416_merge/src/main/org/jboss/jms/server/ConnectionFactoryManager.java
branches/Branch_1416_merge/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java
branches/Branch_1416_merge/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
Log:
adding ordering group configuration parameters for connection factory service
Modified: branches/Branch_1416_merge/src/main/org/jboss/jms/client/container/ProducerAspect.java
===================================================================
--- branches/Branch_1416_merge/src/main/org/jboss/jms/client/container/ProducerAspect.java 2009-02-04 10:56:33 UTC (rev 5804)
+++ branches/Branch_1416_merge/src/main/org/jboss/jms/client/container/ProducerAspect.java 2009-02-04 11:28:46 UTC (rev 5805)
@@ -398,11 +398,7 @@
String orderingGroupName = (String)args[0];
ProducerState state = getProducerState(invocation);
- if (orderingGroupName == null)
- {
- orderingGroupName = "JBM-ORD-GRP:" + UUID.randomUUID().toString();
- }
-
+
state.setOrderingGroupName(orderingGroupName);
state.setOrderingGroupEnabled(true);
Modified: branches/Branch_1416_merge/src/main/org/jboss/jms/client/container/StateCreationAspect.java
===================================================================
--- branches/Branch_1416_merge/src/main/org/jboss/jms/client/container/StateCreationAspect.java 2009-02-04 10:56:33 UTC (rev 5804)
+++ branches/Branch_1416_merge/src/main/org/jboss/jms/client/container/StateCreationAspect.java 2009-02-04 11:28:46 UTC (rev 5805)
@@ -107,7 +107,8 @@
ConnectionState connectionState =
new ConnectionState(serverID, connectionDelegate,
- remotingConnection, versionToUse);
+ remotingConnection, versionToUse,
+ connectionDelegate.isEnableOrderingGroup(), connectionDelegate.getDefaultOrderingGroupName());
listener.setConnectionState(connectionState);
@@ -131,7 +132,8 @@
SessionState sessionState =
new SessionState(connectionState, sessionDelegate, transacted,
- ackMode, xa, sessionDelegate.getDupsOKBatchSize());
+ ackMode, xa, sessionDelegate.getDupsOKBatchSize(),
+ connectionState.isEnableOrderingGroup(), connectionState.getDefaultOrderingGroupName());
delegate.setState(sessionState);
return delegate;
@@ -179,6 +181,11 @@
ProducerState producerState = new ProducerState(sessionState, producerDelegate, dest);
+ if (sessionState.isEnableOrderingGroup())
+ {
+ producerState.setOrderingGroupEnabled(true);
+ producerState.setOrderingGroupName(sessionState.getDefaultOrderingGroupName());
+ }
delegate.setState(producerState);
// send an arbitrary invocation into the producer delegate, this will trigger AOP stack
Modified: branches/Branch_1416_merge/src/main/org/jboss/jms/client/delegate/ClientClusteredConnectionFactoryDelegate.java
===================================================================
--- branches/Branch_1416_merge/src/main/org/jboss/jms/client/delegate/ClientClusteredConnectionFactoryDelegate.java 2009-02-04 10:56:33 UTC (rev 5804)
+++ branches/Branch_1416_merge/src/main/org/jboss/jms/client/delegate/ClientClusteredConnectionFactoryDelegate.java 2009-02-04 11:28:46 UTC (rev 5805)
@@ -55,6 +55,7 @@
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
* @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @author <a href="mailto:hgao at redhat.com">Howard Gao</a>
*
* @version <tt>$Revision$</tt>
*
@@ -204,6 +205,10 @@
private boolean supportsFailover;
private boolean supportsLoadBalancing;
+
+ private boolean enableOrderingGroup;
+
+ private String defaultOrderingGroupName;
// Constructors ---------------------------------------------------------------------------------
@@ -211,13 +216,15 @@
ClientConnectionFactoryDelegate[] delegates,
Map failoverMap,
LoadBalancingPolicy loadBalancingPolicy,
- boolean supportsFailover)
+ boolean supportsFailover, boolean enableOrderingGroup, String defaultOrderingGroupName)
{
this.uniqueName = uniqueName;
this.delegates = delegates;
this.failoverMap = failoverMap;
this.loadBalancingPolicy = loadBalancingPolicy;
this.supportsFailover = supportsFailover;
+ this.setEnableOrderingGroup(enableOrderingGroup);
+ this.setDefaultOrderingGroupName(defaultOrderingGroupName);
}
// ConnectionFactoryDelegate implementation -----------------------------------------------------
@@ -383,6 +390,40 @@
// Inner classes --------------------------------------------------------------------------------
+ /**
+ * @param enableOrderingGroup the enableOrderingGroup to set
+ */
+ public void setEnableOrderingGroup(boolean enableOrderingGroup)
+ {
+ this.enableOrderingGroup = enableOrderingGroup;
+ }
+
+ /**
+ * @return the enableOrderingGroup
+ */
+ public boolean isEnableOrderingGroup()
+ {
+ return enableOrderingGroup;
+ }
+
+
+ /**
+ * @param defaultOrderingGroupName the defaultOrderingGroupName to set
+ */
+ public void setDefaultOrderingGroupName(String defaultOrderingGroupName)
+ {
+ this.defaultOrderingGroupName = defaultOrderingGroupName;
+ }
+
+ /**
+ * @return the defaultOrderingGroupName
+ */
+ public String getDefaultOrderingGroupName()
+ {
+ return defaultOrderingGroupName;
+ }
+
+
static FinalizerShutdownHook finalizerHook;
static
Modified: branches/Branch_1416_merge/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
===================================================================
--- branches/Branch_1416_merge/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java 2009-02-04 10:56:33 UTC (rev 5804)
+++ branches/Branch_1416_merge/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java 2009-02-04 11:28:46 UTC (rev 5805)
@@ -81,6 +81,10 @@
private transient JMSRemotingConnection remotingConnection;
private transient Version versionToUse;
+
+ private boolean enableOrderingGroup;
+
+ private String defaultOrderingGroupName;
// Static ---------------------------------------------------------------------------------------
@@ -339,6 +343,26 @@
out.writeInt(serverID);
}
+ public void setEnableOrderingGroup(boolean enableOrderingGroup)
+ {
+ this.enableOrderingGroup = enableOrderingGroup;
+ }
+
+ public boolean isEnableOrderingGroup()
+ {
+ return enableOrderingGroup;
+ }
+
+ public void setDefaultOrderingGroup(String defaultOrderingGroupName2)
+ {
+ this.defaultOrderingGroupName = defaultOrderingGroupName2;
+ }
+
+ public String getDefaultOrderingGroupName()
+ {
+ return defaultOrderingGroupName;
+ }
+
// Package Private ------------------------------------------------------------------------------
// Private --------------------------------------------------------------------------------------
Modified: branches/Branch_1416_merge/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java
===================================================================
--- branches/Branch_1416_merge/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java 2009-02-04 10:56:33 UTC (rev 5804)
+++ branches/Branch_1416_merge/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java 2009-02-04 11:28:46 UTC (rev 5805)
@@ -79,6 +79,10 @@
private boolean sendAcksAsync;
+ private boolean enableOrderingGroup;
+
+ private String defaultOrderingGroupName;
+
// Static ---------------------------------------------------------------------------------------
/*
@@ -109,7 +113,7 @@
public ClientConnectionFactoryDelegate(String uniqueName, String objectID, int serverID, String serverLocatorURI,
Version serverVersion, boolean clientPing, boolean strictTck,
- boolean sendAcksAsync)
+ boolean sendAcksAsync, boolean enableOrderingGroup, String defaultOrderingGroupName)
{
super(objectID);
@@ -120,6 +124,8 @@
this.clientPing = clientPing;
this.strictTck = strictTck;
this.sendAcksAsync = sendAcksAsync;
+ this.setEnableOrderingGroup(enableOrderingGroup);
+ this.setDefaultOrderingGroupName(defaultOrderingGroupName);
}
public ClientConnectionFactoryDelegate()
@@ -198,6 +204,10 @@
connectionDelegate.setRemotingConnection(remotingConnection);
connectionDelegate.setVersionToUse(version);
+
+ connectionDelegate.setEnableOrderingGroup(this.enableOrderingGroup);
+
+ connectionDelegate.setDefaultOrderingGroup(this.defaultOrderingGroupName);
}
else
{
@@ -357,6 +367,38 @@
out.writeBoolean(sendAcksAsync);
}
+ /**
+ * @param enableOrderingGroup the enableOrderingGroup to set
+ */
+ public void setEnableOrderingGroup(boolean enableOrderingGroup)
+ {
+ this.enableOrderingGroup = enableOrderingGroup;
+ }
+
+ /**
+ * @return the enableOrderingGroup
+ */
+ public boolean isEnableOrderingGroup()
+ {
+ return enableOrderingGroup;
+ }
+
+ /**
+ * @param defaultOrderingGroupName the defaultOrderingGroupName to set
+ */
+ public void setDefaultOrderingGroupName(String defaultOrderingGroupName)
+ {
+ this.defaultOrderingGroupName = defaultOrderingGroupName;
+ }
+
+ /**
+ * @return the defaultOrderingGroupName
+ */
+ public String getDefaultOrderingGroupName()
+ {
+ return defaultOrderingGroupName;
+ }
+
// Inner Classes --------------------------------------------------------------------------------
}
Modified: branches/Branch_1416_merge/src/main/org/jboss/jms/client/state/ConnectionState.java
===================================================================
--- branches/Branch_1416_merge/src/main/org/jboss/jms/client/state/ConnectionState.java 2009-02-04 10:56:33 UTC (rev 5804)
+++ branches/Branch_1416_merge/src/main/org/jboss/jms/client/state/ConnectionState.java 2009-02-04 11:28:46 UTC (rev 5805)
@@ -87,12 +87,16 @@
private ConnectionFactoryDelegate clusteredConnectionFactoryDelegate;
private FailoverCommandCenter fcc;
+
+ private boolean enableOrderingGroup;
+
+ private String defaultOrderingGroupName;
// Constructors ---------------------------------------------------------------------------------
public ConnectionState(int serverID, ConnectionDelegate delegate,
JMSRemotingConnection remotingConnection,
- Version versionToUse)
+ Version versionToUse, boolean enableOrderingGroup, String defaultOrderingGroupName)
throws Exception
{
super(null, (DelegateSupport)delegate);
@@ -110,6 +114,10 @@
this.resourceManager = ResourceManagerFactory.instance.checkOutResourceManager(serverID);
this.serverID = serverID;
+
+ this.setEnableOrderingGroup(enableOrderingGroup);
+
+ this.setDefaultOrderingGroupName(defaultOrderingGroupName);
}
// HierarchicalState implementation -------------------------------------------------------------
@@ -285,6 +293,38 @@
return "ConnectionState[" + ((ClientConnectionDelegate)delegate).getID() + "]";
}
+ /**
+ * @param enableOrderingGroup the enableOrderingGroup to set
+ */
+ public void setEnableOrderingGroup(boolean enableOrderingGroup)
+ {
+ this.enableOrderingGroup = enableOrderingGroup;
+ }
+
+ /**
+ * @return the enableOrderingGroup
+ */
+ public boolean isEnableOrderingGroup()
+ {
+ return enableOrderingGroup;
+ }
+
+ /**
+ * @param defaultOrderingGroupName the defaultOrderingGroupName to set
+ */
+ public void setDefaultOrderingGroupName(String defaultOrderingGroupName)
+ {
+ this.defaultOrderingGroupName = defaultOrderingGroupName;
+ }
+
+ /**
+ * @return the defaultOrderingGroupName
+ */
+ public String getDefaultOrderingGroupName()
+ {
+ return defaultOrderingGroupName;
+ }
+
// Package protected ----------------------------------------------------------------------------
// Protected ------------------------------------------------------------------------------------
Modified: branches/Branch_1416_merge/src/main/org/jboss/jms/client/state/ProducerState.java
===================================================================
--- branches/Branch_1416_merge/src/main/org/jboss/jms/client/state/ProducerState.java 2009-02-04 10:56:33 UTC (rev 5804)
+++ branches/Branch_1416_merge/src/main/org/jboss/jms/client/state/ProducerState.java 2009-02-04 11:28:46 UTC (rev 5805)
@@ -22,6 +22,7 @@
package org.jboss.jms.client.state;
import java.util.Collections;
+import java.util.UUID;
import javax.jms.DeliveryMode;
import javax.jms.Destination;
@@ -179,9 +180,13 @@
return isOrderingGroupEnabled;
}
- public void setOrderingGroupName(String orderingGroupName)
+ public void setOrderingGroupName(String ordGroupName)
{
- this.orderingGroupName = orderingGroupName;
+ if (ordGroupName == null)
+ {
+ ordGroupName = "JBM-ORD-GRP:" + UUID.randomUUID().toString();
+ }
+ this.orderingGroupName = ordGroupName;
}
public String getOrderingGroupName()
Modified: branches/Branch_1416_merge/src/main/org/jboss/jms/client/state/SessionState.java
===================================================================
--- branches/Branch_1416_merge/src/main/org/jboss/jms/client/state/SessionState.java 2009-02-04 10:56:33 UTC (rev 5804)
+++ branches/Branch_1416_merge/src/main/org/jboss/jms/client/state/SessionState.java 2009-02-04 11:28:46 UTC (rev 5805)
@@ -122,11 +122,15 @@
private long npSendSequence;
+ private boolean enableOrderingGroup;
+
+ private String defaultOrderingGroupName;
+
// Constructors ---------------------------------------------------------------------------------
public SessionState(ConnectionState parent, ClientSessionDelegate delegate,
boolean transacted, int ackMode, boolean xa,
- int dupsOKBatchSize)
+ int dupsOKBatchSize, boolean enableOrderingGroup, String defaultOrderingGroupName)
{
super(parent, (DelegateSupport)delegate);
@@ -161,6 +165,10 @@
callbackHandlers = new HashMap();
executor = executorFactory.getExecutor("jbm-client-session-threads");
+
+ this.setEnableOrderingGroup(enableOrderingGroup);
+
+ this.setDefaultOrderingGroupName(defaultOrderingGroupName);
}
// HierarchicalState implementation -------------------------------------------------------------
@@ -510,6 +518,38 @@
// Inner classes --------------------------------------------------------------------------------
+ /**
+ * @param enableOrderingGroup the enableOrderingGroup to set
+ */
+ public void setEnableOrderingGroup(boolean enableOrderingGroup)
+ {
+ this.enableOrderingGroup = enableOrderingGroup;
+ }
+
+ /**
+ * @return the enableOrderingGroup
+ */
+ public boolean isEnableOrderingGroup()
+ {
+ return enableOrderingGroup;
+ }
+
+ /**
+ * @param defaultOrderingGroupName the defaultOrderingGroupName to set
+ */
+ public void setDefaultOrderingGroupName(String defaultOrderingGroupName)
+ {
+ this.defaultOrderingGroupName = defaultOrderingGroupName;
+ }
+
+ /**
+ * @return the defaultOrderingGroupName
+ */
+ public String getDefaultOrderingGroupName()
+ {
+ return defaultOrderingGroupName;
+ }
+
//A sequence generator class. sequence starts from 1
public static class OrderingGroupSeq
{
Modified: branches/Branch_1416_merge/src/main/org/jboss/jms/server/ConnectionFactoryManager.java
===================================================================
--- branches/Branch_1416_merge/src/main/org/jboss/jms/server/ConnectionFactoryManager.java 2009-02-04 10:56:33 UTC (rev 5804)
+++ branches/Branch_1416_merge/src/main/org/jboss/jms/server/ConnectionFactoryManager.java 2009-02-04 11:28:46 UTC (rev 5805)
@@ -28,6 +28,7 @@
/**
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @author <a href="mailto:hgao at redhat.com">Howard Gao</a>
* @version <tt>$Revision$</tt>
* <p/>
* $Id$
@@ -50,7 +51,9 @@
boolean supportsLoadBalancing,
LoadBalancingFactory loadBalancingPolicy,
boolean strictTck,
- boolean sendAcksAsync) throws Exception;
+ boolean sendAcksAsync,
+ boolean enableOrderingGroup,
+ String defaultOrderingGroupName) throws Exception;
void unregisterConnectionFactory(String uniqueName, boolean supportsFailover, boolean supportsLoadBalancing) throws Exception;
}
Modified: branches/Branch_1416_merge/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java
===================================================================
--- branches/Branch_1416_merge/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java 2009-02-04 10:56:33 UTC (rev 5804)
+++ branches/Branch_1416_merge/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java 2009-02-04 11:28:46 UTC (rev 5805)
@@ -32,6 +32,7 @@
*
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @author <a href="mailto:hgao at redhat.com">Howard Gao</a>
* @version <tt>$Revision$</tt>
*
* $Id$
@@ -83,6 +84,10 @@
private boolean sendAcksAsync;
private boolean disableRemotingChecks;
+
+ private boolean enableOrderingGroup;
+
+ private String defaultOrderingGroupName;
// Constructors ---------------------------------------------------------------------------------
@@ -206,7 +211,7 @@
locatorURI, enablePing, prefetchSize, slowConsumers,
defaultTempQueueFullSize, defaultTempQueuePageSize,
defaultTempQueueDownCacheSize, dupsOKBatchSize, supportsFailover, supportsLoadBalancing,
- loadBalancingFactory, strictTck, sendAcksAsync);
+ loadBalancingFactory, strictTck, sendAcksAsync, enableOrderingGroup, defaultOrderingGroupName);
String info = "Connector " + locator.getProtocol() + "://" +
locator.getHost() + ":" + locator.getPort();
@@ -464,7 +469,26 @@
this.disableRemotingChecks = disable;
}
+
+ public void setEnableOrderingGroup(boolean enable)
+ {
+ enableOrderingGroup = enable;
+ }
+ public boolean isEnableOrderingGroup()
+ {
+ return enableOrderingGroup;
+ }
+
+ public void setDefaultOrderingGroupName(String name)
+ {
+ defaultOrderingGroupName = name;
+ }
+
+ public String getDefaultOrderingGroupName()
+ {
+ return defaultOrderingGroupName;
+ }
// JMX managed operations -----------------------------------------------------------------------
// Public ---------------------------------------------------------------------------------------
Modified: branches/Branch_1416_merge/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
===================================================================
--- branches/Branch_1416_merge/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java 2009-02-04 10:56:33 UTC (rev 5804)
+++ branches/Branch_1416_merge/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java 2009-02-04 11:28:46 UTC (rev 5805)
@@ -64,6 +64,8 @@
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
* @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
+ * @author <a href="mailto:hgao at redhat.com">Howard Gao</a>
+ *
* @version <tt>$Revision$</tt>
*
* $Id$
@@ -127,7 +129,9 @@
boolean supportsLoadBalancing,
LoadBalancingFactory loadBalancingFactory,
boolean strictTck,
- boolean sendAcksAsync)
+ boolean sendAcksAsync,
+ boolean enableOrderingGroup,
+ String defaultOrderingGroupName)
throws Exception
{
log.debug(this + " registering connection factory '" + uniqueName + "', bindings: " + jndiBindings);
@@ -182,7 +186,7 @@
ClientConnectionFactoryDelegate localDelegate =
new ClientConnectionFactoryDelegate(uniqueName, id, serverPeer.getServerPeerID(),
locatorURI, version, clientPing, useStrict,
- sendAcksAsync);
+ sendAcksAsync, enableOrderingGroup, defaultOrderingGroupName);
log.debug(this + " created local delegate " + localDelegate);
@@ -212,7 +216,7 @@
log.error(msg);
throw new IllegalArgumentException(msg);
}
- delegate = createClusteredDelegate(uniqueName, localDelegates.values(), loadBalancingFactory, endpoint, supportsFailover);
+ delegate = createClusteredDelegate(uniqueName, localDelegates.values(), loadBalancingFactory, endpoint, supportsFailover, enableOrderingGroup, defaultOrderingGroupName);
log.debug(this + " created clustered delegate " + delegate);
}
@@ -462,7 +466,8 @@
*/
private ClientClusteredConnectionFactoryDelegate createClusteredDelegate(String uniqueName, Collection localDelegates, LoadBalancingFactory loadBalancingFactory,
ServerConnectionFactoryEndpoint endpoint,
- boolean supportsFailover)
+ boolean supportsFailover, boolean enableOrderingGroup,
+ String defaultOrderingGroupName)
throws Exception
{
log.trace(this + " creating a clustered ConnectionFactoryDelegate based on " + localDelegates);
@@ -480,7 +485,7 @@
endpoint.updateTopology(delegates, failoverMap);
- return new ClientClusteredConnectionFactoryDelegate(uniqueName, delegates, failoverMap, lbp, supportsFailover);
+ return new ClientClusteredConnectionFactoryDelegate(uniqueName, delegates, failoverMap, lbp, supportsFailover, enableOrderingGroup, defaultOrderingGroupName);
}
private void rebindConnectionFactory(Context ic, JNDIBindings jndiBindings,
More information about the jboss-cvs-commits
mailing list