[jboss-cvs] JBoss Messaging SVN: r3402 - in branches/Branch_Stable: src/main/org/jboss/jms/server and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2007-12-03 11:06:46 -0500 (Mon, 03 Dec 2007)
New Revision: 3402

Modified:
   branches/Branch_Stable/docs/userguide/en/modules/c_configuration.xml
   branches/Branch_Stable/docs/userguide/en/modules/configuration.xml
   branches/Branch_Stable/src/main/org/jboss/jms/server/ServerPeer.java
Log:
Allow disabling of message sucking


Modified: branches/Branch_Stable/docs/userguide/en/modules/c_configuration.xml
===================================================================
--- branches/Branch_Stable/docs/userguide/en/modules/c_configuration.xml	2007-12-03 15:17:45 UTC (rev 3401)
+++ branches/Branch_Stable/docs/userguide/en/modules/c_configuration.xml	2007-12-03 16:06:46 UTC (rev 3402)
@@ -22,6 +22,9 @@
 	<para>JBoss Messaging balances messages between nodes, catering for faster
 		or slower consumers to efficiently balance processing load across the
 		cluster.</para>
+	<para>If you do not want message redistribution between nodes, but still want to retain the other charactereristics
+	of clustered destinations. You can do this by not specifying the attribute ClusterPullConnectionFactoryName on the server peer
+        </para>
    </section>
    
       <section id="c_conf.clustereddursubs">

Modified: branches/Branch_Stable/docs/userguide/en/modules/configuration.xml
===================================================================
--- branches/Branch_Stable/docs/userguide/en/modules/configuration.xml	2007-12-03 15:17:45 UTC (rev 3401)
+++ branches/Branch_Stable/docs/userguide/en/modules/configuration.xml	2007-12-03 16:06:46 UTC (rev 3402)
@@ -264,8 +264,9 @@
          <section id="conf.serverpeer.attributes.clusterpullconnectionfactory">
             <title>ClusterPullConnectionFactory</title>
             <para>The name of the connection factory to use for pulling
-            messages between nodes. You will not normally need to change
-            this.</para>
+            messages between nodes. </para>
+            <para>If you wish to turn off message sucking between queues altogether, but retain failover, then you can ommit this attribute
+            altogether</para>
          </section>
          <section id="conf.serverpeer.attributes.defaultpreserveordering">
             <title>DefaultPreserveOrdering</title>

Modified: branches/Branch_Stable/src/main/org/jboss/jms/server/ServerPeer.java
===================================================================
--- branches/Branch_Stable/src/main/org/jboss/jms/server/ServerPeer.java	2007-12-03 15:17:45 UTC (rev 3401)
+++ branches/Branch_Stable/src/main/org/jboss/jms/server/ServerPeer.java	2007-12-03 16:06:46 UTC (rev 3402)
@@ -156,7 +156,7 @@
    
    //From a system property - this overrides
    private boolean strictTckProperty;
-      
+        
    // wired components
 
    private DestinationJNDIMapper destinationJNDIMapper;
@@ -291,7 +291,10 @@
          securityStore.setSuckerPassword(suckerPassword);
          securityStore.start();
          txRepository.start();
-         clusterConnectionManager.start();
+         if (clusterConnectionManager != null)
+         {
+            clusterConnectionManager.start();
+         }
          
          // Note we do not start the message counter manager by default. This must be done
          // explicitly by the user by calling enableMessageCounters(). This is because message
@@ -362,7 +365,10 @@
          txRepository = null;
          messageCounterManager.stop();
          messageCounterManager = null;
-         clusterConnectionManager.stop();
+         if (clusterConnectionManager != null)
+         {
+            clusterConnectionManager.stop();
+         }
          clusterConnectionManager = null;
          postOffice = null;
          
@@ -1098,7 +1104,10 @@
    
    public void resetAllSuckers()
    {
-   	clusterConnectionManager.resetAllSuckers();
+      if (this.clusterConnectionManager != null)
+      {
+         clusterConnectionManager.resetAllSuckers();
+      }
    }
      
    public byte[] getClientAOPStack()
@@ -1297,10 +1306,13 @@
             
             // Also inject into the cluster connection manager
             
-            this.clusterConnectionManager.injectPostOffice(postOffice);
+            if (this.clusterConnectionManager != null)
+            {
+               this.clusterConnectionManager.injectPostOffice(postOffice);
+               
+               this.clusterConnectionManager.injectReplicator((Replicator)postOffice);
+            }
             
-            this.clusterConnectionManager.injectReplicator((Replicator)postOffice);
-            
             this.connectionManager.injectReplicator((Replicator)postOffice);
             
             ((MessagingPostOffice)postOffice).injectServerPeer(this);