From 02954b0555d3832ba2a23c787e511023e634e2e0 Mon Sep 17 00:00:00 2001
From: Bosanac Dejan <dejanb@apache.org>
Date: Mon, 28 Sep 2009 13:06:59 +0000
Subject: [PATCH] merging http://svn.apache.org/viewvc?rev=819520&view=rev

git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@819521 13f79535-47bb-0310-9956-ffa450edef68
---
 assembly/src/release/conf/activemq.xml        | 42 ++++++++++++-------
 .../src/sample-conf/activemq-throughput.xml   | 17 ++++----
 2 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/assembly/src/release/conf/activemq.xml b/assembly/src/release/conf/activemq.xml
index 64ae5ec0e1..e309e0a8e3 100755
--- a/assembly/src/release/conf/activemq.xml
+++ b/assembly/src/release/conf/activemq.xml
@@ -57,23 +57,35 @@
         
         
         <!--
-            It's advisable to turn on producer flow control in the production system
-
+			For better performances use VM cursor and small memory limit.
+			For more information, see:
+            
+            http://activemq.apache.org/message-cursors.html
+            
+            Also, if your producer is "hanging", it's probably due to producer flow control.
+            For more information, see:
+            http://activemq.apache.org/producer-flow-control.html
+        -->
+              
+        <destinationPolicy>
+            <policyMap>
+              <policyEntries>
+                <policyEntry topic=">" producerFlowControl="true" memoryLimit="1mb">
+                  <pendingSubscriberPolicy>
+                    <vmCursor />
+                  </pendingSubscriberPolicy>
+                </policyEntry>
+                <policyEntry queue=">" producerFlowControl="true" memoryLimit="1mb" />
+              </policyEntries>
+            </policyMap>
+        </destinationPolicy> 
+ 
+         <!--
             The systemUsage controls the maximum amount of space the broker will 
             use before slowing down producers. For more information, see:
             
             http://activemq.apache.org/producer-flow-control.html
-              
-        <destinationPolicy>
-            <policyMap>
-                <policyEntries>
-                    <policyEntry queue=">" producerFlowControl="true" />
-                    <policyEntry topic=">" producerFlowControl="true" />
-                </policyEntries>
-            </policyMap>
-        </destinationPolicy> 
- 
-        
+             
         <systemUsage>
             <systemUsage>
                 <memoryUsage>
@@ -87,8 +99,8 @@
                 </tempUsage>
             </systemUsage>
         </systemUsage>
-        -->
-
+		-->
+		  
         <!-- 
             The transport connectors expose ActiveMQ over a given protocol to
             clients and other brokers. For more information, see: 
diff --git a/assembly/src/sample-conf/activemq-throughput.xml b/assembly/src/sample-conf/activemq-throughput.xml
index 0bb5fd3f00..305c244448 100644
--- a/assembly/src/sample-conf/activemq-throughput.xml
+++ b/assembly/src/sample-conf/activemq-throughput.xml
@@ -40,15 +40,16 @@
         -->
         <destinationPolicy>
             <policyMap>
-                <policyEntries>
-                    <policyEntry queue=">">
-                        <pendingQueuePolicy>
-                            <vmQueueCursor />
-                        </pendingQueuePolicy>
-                    </policyEntry>
-                </policyEntries>
+              <policyEntries>
+                <policyEntry topic=">" producerFlowControl="true" memoryLimit="1mb">
+                  <pendingSubscriberPolicy>
+                    <vmCursor />
+                  </pendingSubscriberPolicy>
+                </policyEntry>
+                <policyEntry queue=">" producerFlowControl="true" memoryLimit="1mb" />
+              </policyEntries>
             </policyMap>
-        </destinationPolicy>
+        </destinationPolicy> 
 
         <!-- 
             Use KahaDB for persistence