Issue 121 - Update activemq examples in docs and in ext for 5.4

Update single broker example for 5.4.0 Signed-off-by: R.I.Pienaar <rip@devco.net>
ustuehler · Aug 21, 2010 · e7e40d3 · e7e40d3
1 parent 224d0b1
commit e7e40d3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 33 deletions.
diff --git a/ext/activemq/examples/single-broker/README b/ext/activemq/examples/single-broker/README
@@ -1,4 +1,4 @@
-Simple single broker setup for ActiveMQ 5.3.0.
+Simple single broker setup for ActiveMQ 5.4.0.
 
 Provides 2 users, one admin and one for mcollective.
 Admin user can create all sorts of queues and topics,

diff --git a/ext/activemq/examples/single-broker/activemq.xml b/ext/activemq/examples/single-broker/activemq.xml
@@ -3,33 +3,14 @@
   xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
   http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
 
-    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="stomp1" useJmx="true">
+    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" useJmx="true">
         <managementContext>
-          <managementContext connectorPort="1099" jmxDomainName="org.apache.activemq"/>
+            <managementContext createConnector="false"/>
         </managementContext>
 
-        <systemUsage>
-          <systemUsage>
-            <memoryUsage>
-              <memoryUsage limit="20 mb" />
-            </memoryUsage>
-            <storeUsage>
-              <storeUsage limit="1 gb" />
-            </storeUsage>
-            <tempUsage>
-              <tempUsage limit="100 mb" />
-            </tempUsage>
-          </systemUsage>
-        </systemUsage>
-
-        <transportConnectors>
-          <transportConnector name="openwire" uri="tcp://0.0.0.0:6166"/>
-          <transportConnector name="stomp"   uri="stomp://0.0.0.0:6163"/>
-        </transportConnectors>
-
         <plugins>
           <statisticsBrokerPlugin/>
           <simpleAuthenticationPlugin>
@@ -52,15 +33,24 @@
             </map>
           </authorizationPlugin>
         </plugins>
-    </broker>
 
-    <jetty xmlns="http://mortbay.com/schemas/jetty/1.0">
-        <connectors>
-            <nioConnector port="8160"/>
-        </connectors>
-
-        <handlers>
-	    <webAppContext contextPath="/admin" resourceBase="/var/lib/activemq/webapps/admin" logUrlOnStart="true"/>
-        </handlers>
-    </jetty>
+        <systemUsage>
+            <systemUsage>
+                <memoryUsage>
+                    <memoryUsage limit="20 mb"/>
+                </memoryUsage>
+                <storeUsage>
+                    <storeUsage limit="1 gb" name="foo"/>
+                </storeUsage>
+                <tempUsage>
+                    <tempUsage limit="100 mb"/>
+                </tempUsage>
+            </systemUsage>
+        </systemUsage>
+
+        <transportConnectors>
+            <transportConnector name="openwire" uri="tcp://0.0.0.0:6166"/>
+            <transportConnector name="stomp" uri="stomp://0.0.0.0:6163"/>
+        </transportConnectors>
+    </broker>
 </beans>