From e16b7dbf16f6446b1ebf4747a841c70104cc9358 Mon Sep 17 00:00:00 2001
From: Robert Davies <rajdavies@apache.org>
Date: Tue, 16 Oct 2007 05:01:31 +0000
Subject: [PATCH] updated to take account of new System Usage

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@585040 13f79535-47bb-0310-9956-ffa450edef68
---
 assembly/src/release/conf/activemq.xml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/assembly/src/release/conf/activemq.xml b/assembly/src/release/conf/activemq.xml
index 1b910c0d5a..ac97859f95 100755
--- a/assembly/src/release/conf/activemq.xml
+++ b/assembly/src/release/conf/activemq.xml
@@ -78,12 +78,22 @@
         <jdbcPersistenceAdapter dataSource="#postgres-ds"/>
     </persistenceAdapter>
     -->
-
+   
     <!--  Use the following to set the broker memory limit
-    <memoryManager>  
-        <usageManager id="memory-manager" limit="20 MB"/>
-    </memoryManager>
-    -->
+	<systemUsage>
+	            <systemUsage>
+		            <memoryUsage>
+	    	            	<memoryUsage limit="10 mb" percentUsageMinDelta="20"/>
+		            </memoryUsage>
+		            <tempUsage>
+	    	            	<tempUsage limit="100 mb"/>
+		            </tempUsage>
+		            <storeUsage>
+	    	            	<storeUsage limit="1 gb" name="foo"/>
+		            </storeUsage>
+	            </systemUsage>
+	    </systemUsage>
+   -->
     
     <!-- Use the following to configure how ActiveMQ is exposed in JMX
     <managementContext>