diff --git a/activemq-core/src/main/resources/activemq.xsd b/activemq-core/src/main/resources/activemq.xsd
index d27a6ba56b..3ec43de543 100644
--- a/activemq-core/src/main/resources/activemq.xsd
+++ b/activemq-core/src/main/resources/activemq.xsd
@@ -177,7 +177,7 @@ destination or a hierarchical wildcard area of destinations.
       <xs:sequence>
         <xs:element name='adminACLs' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other' minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='destination' minOccurs='0' maxOccurs='1'>
@@ -191,12 +191,12 @@ destination or a hierarchical wildcard area of destinations.
         </xs:element>
         <xs:element name='readACLs' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='writeACLs' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
@@ -245,7 +245,7 @@ for each operation.
             ]]></xs:documentation>
           </xs:annotation>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='defaultEntry' minOccurs='0' maxOccurs='1'>
@@ -265,7 +265,7 @@ dependency injection framework such as Spring
             ]]></xs:documentation>
           </xs:annotation>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='tempDestinationAuthorizationEntry' minOccurs='0' maxOccurs='1'>
@@ -498,7 +498,7 @@ consume a given message
         </xs:element>
         <xs:element name='networkConnectorURIs' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='networkConnectors' minOccurs='0' maxOccurs='1'>
@@ -530,6 +530,7 @@ other brokers in a federated network
               <xs:element ref='tns:journalPersistenceAdapter'/>
               <xs:element ref='tns:kahaPersistenceAdapter'/>
               <xs:element ref='tns:memoryPersistenceAdapter'/>
+              <xs:element ref='tns:journaledJDBC'/>
               <xs:any namespace='##other'/>
             </xs:choice>
           </xs:complexType>
@@ -587,7 +588,7 @@ other brokers in a federated network
             ]]></xs:documentation>
           </xs:annotation>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='regionBroker' minOccurs='0' maxOccurs='1'>
@@ -653,7 +654,7 @@ other brokers in a federated network
         </xs:element>
         <xs:element name='transportConnectorURIs' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='transportConnectors' minOccurs='0' maxOccurs='1'>
@@ -1032,7 +1033,7 @@ a single Transport could be communicating with multiple remote brokers
             ]]></xs:documentation>
           </xs:annotation>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
@@ -1084,7 +1085,7 @@ queue with the same name).
             ]]></xs:documentation>
           </xs:annotation>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
@@ -2863,7 +2864,7 @@ false so that messages actually reside long term in the JDBC database.
         </xs:element>
         <xs:element name='options' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='queueSearchMatchingFormat' minOccurs='0' maxOccurs='1'>
@@ -2944,22 +2945,22 @@ and ipService objectClasses as defined in RFC 2307.
         </xs:element>
         <xs:element name='durableDestinations' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='dynamicallyIncludedDestinations' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='excludedDestinations' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='staticallyIncludedDestinations' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
@@ -3383,17 +3384,17 @@ based transport could be used.
         </xs:element>
         <xs:element name='durableDestinations' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='dynamicallyIncludedDestinations' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='excludedDestinations' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='localTransport' minOccurs='0' maxOccurs='1'>
@@ -3413,7 +3414,7 @@ based transport could be used.
         </xs:element>
         <xs:element name='staticallyIncludedDestinations' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
@@ -3546,22 +3547,22 @@ available and setup a connection to each available remote broker
         </xs:element>
         <xs:element name='durableDestinations' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='dynamicallyIncludedDestinations' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='excludedDestinations' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='staticallyIncludedDestinations' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
@@ -4110,7 +4111,7 @@ dependency injection framework such as Spring
             ]]></xs:documentation>
           </xs:annotation>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='policyEntries' minOccurs='0' maxOccurs='1'>
@@ -4120,7 +4121,7 @@ dependency injection framework such as Spring
             ]]></xs:documentation>
           </xs:annotation>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
@@ -4402,7 +4403,7 @@ Set of groups
             ]]></xs:documentation>
           </xs:annotation>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='userPasswords' minOccurs='0' maxOccurs='1'>
@@ -4412,7 +4413,7 @@ Set of groups
             ]]></xs:documentation>
           </xs:annotation>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='users' minOccurs='0' maxOccurs='1'>
@@ -4422,7 +4423,7 @@ Set of groups
             ]]></xs:documentation>
           </xs:annotation>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
@@ -4591,12 +4592,12 @@ matches the message.
       <xs:sequence>
         <xs:element name='createSchemaStatements' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='dropSchemaStatements' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
@@ -4889,7 +4890,7 @@ destination
       <xs:sequence>
         <xs:element name='adminACLs' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='destination' minOccurs='0' maxOccurs='1'>
@@ -4903,12 +4904,12 @@ destination
         </xs:element>
         <xs:element name='readACLs' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name='writeACLs' minOccurs='0' maxOccurs='1'>
           <xs:complexType>
-            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any namespace='##other'/></xs:sequence>
+            <xs:sequence minOccurs='0' maxOccurs='unbounded'><xs:any minOccurs='0' maxOccurs='unbounded'/></xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
diff --git a/assembly/src/release/conf/activemq.xml b/assembly/src/release/conf/activemq.xml
index 34e8d77d13..8c891d3041 100755
--- a/assembly/src/release/conf/activemq.xml
+++ b/assembly/src/release/conf/activemq.xml
@@ -20,175 +20,172 @@
   xmlns:amq="http://activemq.org/config/1.0"
   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.org/config/1.0 http://activemq.apache.org/schema/activemq-core.xsd
+  http://activemq.org/config/1.0 http://activemq.apache.org/schema/core/activemq-core-VERSION.xsd   
   http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
 
-  <!-- Allows us to use system properties as variables in this configuration file -->
-  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-  
-  <broker xmlns="http://activemq.org/config/1.0" brokerName="localhost" dataDirectory="${activemq.base}/data">
-  
-    <!-- Destination specific policies using destination names or wildcards -->
-    <destinationPolicy>
-      <policyMap>
-        <policyEntries>
+    <!-- Allows us to use system properties as variables in this configuration file -->
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-          <policyEntry topic="FOO.>" producerFlowControl="false" memoryLimit="1mb">
-            <dispatchPolicy>
-              <strictOrderDispatchPolicy/>
-            </dispatchPolicy>
-            <subscriptionRecoveryPolicy>
-              <lastImageSubscriptionRecoveryPolicy/>
-            </subscriptionRecoveryPolicy>
-          </policyEntry>
+    <broker xmlns="http://activemq.org/config/1.0" brokerName="localhost" dataDirectory="${activemq.base}/data">
 
-        </policyEntries>
-      </policyMap>
-    </destinationPolicy>
+        <!-- Destination specific policies using destination names or wildcards -->
+        <destinationPolicy>
+            <policyMap>
+                <policyEntries>
+                    <policyEntry queue=">" memoryLimit="5mb"/>
+                    <policyEntry topic=">" memoryLimit="5mb">
+                        <dispatchPolicy>
+                            <strictOrderDispatchPolicy/>
+                        </dispatchPolicy>
+                        <subscriptionRecoveryPolicy>
+                            <lastImageSubscriptionRecoveryPolicy/>
+                        </subscriptionRecoveryPolicy>
+                    </policyEntry>
+                </policyEntries>
+            </policyMap>
+        </destinationPolicy>
+
+        <!-- Use the following to configure how ActiveMQ is exposed in JMX -->
+        <managementContext>
+            <managementContext createConnector="false"/>
+        </managementContext>
+
+        <!-- The store and forward broker networks ActiveMQ will listen to -->
+        <networkConnectors>
+            <!-- by default just auto discover the other brokers -->
+            <networkConnector name="default-nc" uri="multicast://default"/>
+            <!-- Example of a static configuration:
+            <networkConnector name="host1 and host2" uri="static://(tcp://host1:61616,tcp://host2:61616)"/>
+            -->
+        </networkConnectors>
+
+        <persistenceAdapter>
+            <amqPersistenceAdapter syncOnWrite="false" directory="${activemq.base}/activemq-data" maxFileLength="20 mb"/>
+        </persistenceAdapter>
+
+        <!-- Use the following if you wish to configure the journal with JDBC -->
+        <!--
+        <persistenceAdapter>
+            <journaledJDBC dataDirectory="${activemq.base}/activemq-data" dataSource="#postgres-ds"/>
+        </persistenceAdapter>
+        -->
+
+        <!-- Or if you want to use pure JDBC without a journal -->
+        <!--
+        <persistenceAdapter>
+            <jdbcPersistenceAdapter dataSource="#postgres-ds"/>
+        </persistenceAdapter>
+        -->
+
+        <!--  The maximum about of space the broker will use before slowing down producers -->
+        <systemUsage>
+            <systemUsage>
+                <memoryUsage>
+                    <memoryUsage limit="20 mb"/>
+                </memoryUsage>
+                <storeUsage>
+                    <storeUsage limit="1 gb" name="foo"/>
+                </storeUsage>
+                <tempUsage>
+                    <tempUsage limit="100 mb"/>
+                </tempUsage>
+            </systemUsage>
+        </systemUsage>
 
 
-    <!-- The transport connectors ActiveMQ will listen to -->
-    <transportConnectors>
-       <transportConnector name="openwire" uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
-       <transportConnector name="ssl"     uri="ssl://localhost:61617"/>
-       <transportConnector name="stomp"   uri="stomp://localhost:61613"/>
-       <transportConnector name="xmpp"    uri="xmpp://localhost:61222"/>
-    </transportConnectors>
+        <!-- The transport connectors ActiveMQ will listen to -->
+        <transportConnectors>
+            <transportConnector name="openwire" uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
+            <transportConnector name="ssl" uri="ssl://localhost:61617"/>
+            <transportConnector name="stomp" uri="stomp://localhost:61613"/>
+            <transportConnector name="xmpp" uri="xmpp://localhost:61222"/>
+        </transportConnectors>
 
-    <!-- The store and forward broker networks ActiveMQ will listen to -->
-    <networkConnectors>
-      <!-- by default just auto discover the other brokers -->
-      <networkConnector name="default-nc" uri="multicast://default"/>
-      <!--
-      <networkConnector name="host1 and host2" uri="static://(tcp://host1:61616,tcp://host2:61616)"/>
-      -->
-    </networkConnectors>
+    </broker>
 
-
-    <!-- Use the following if you wish to configure the journal with JDBC -->
     <!--
-    <persistenceAdapter>
-        <journaledJDBC journalLogFiles="5" dataDirectory="${activemq.base}/activemq-data"  dataSource="#postgres-ds"/>
-    </persistenceAdapter>
-    -->
-
-    <!-- Or if you want to use pure JDBC without a journal -->
-    <!--
-    <persistenceAdapter>
-        <jdbcPersistenceAdapter dataSource="#postgres-ds"/>
-    </persistenceAdapter>
-    -->
-   
-    <!--  Use the following to set the broker memory limit
-	<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>
-       <managementContext connectorPort="1099" jmxDomainName="org.apache.activemq"/>
-    </managementContext>
-    -->
-
-  </broker>
-
-  <!--
     ** Lets deploy some Enterprise Integration Patterns inside the ActiveMQ Message Broker
     ** For more details see
     **
     ** http://activemq.apache.org/enterprise-integration-patterns.html
     -->
-  <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
+    <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
 
-    <!-- You can use a <package> element for each root package to search for Java routes -->
-    <package>org.foo.bar</package>
+        <!-- You can use a <package> element for each root package to search for Java routes -->
+        <package>org.foo.bar</package>
 
-    <!-- You can use Spring XML syntax to define the routes here using the <route> element -->
-    <route>
-      <from uri="activemq:example.A"/>
-      <to uri="activemq:example.B"/>
-    </route>
-  </camelContext>
+        <!-- You can use Spring XML syntax to define the routes here using the <route> element -->
+        <route>
+            <from uri="activemq:example.A"/>
+            <to uri="activemq:example.B"/>
+        </route>
+    </camelContext>
 
 
-
-  <!-- lets create a command agent to respond to message based admin commands on the ActiveMQ.Agent topic -->
-  <commandAgent xmlns="http://activemq.org/config/1.0"/>
+    <!-- lets create a command agent to respond to message based admin commands on the ActiveMQ.Agent topic -->
+    <commandAgent xmlns="http://activemq.org/config/1.0" brokerUrl="vm://localhost"/>
 
 
-  <!-- An embedded servlet engine for serving up the Admin console -->
-  <jetty xmlns="http://mortbay.com/schemas/jetty/1.0">
-    <connectors>
-      <nioConnector port="8161" />
-    </connectors>
+    <!-- An embedded servlet engine for serving up the Admin console -->
+    <jetty xmlns="http://mortbay.com/schemas/jetty/1.0">
+        <connectors>
+            <nioConnector port="8161"/>
+        </connectors>
 
-    <handlers>
-      <webAppContext contextPath="/admin" resourceBase="${activemq.base}/webapps/admin" logUrlOnStart="true" />
-      <webAppContext contextPath="/demo" resourceBase="${activemq.base}/webapps/demo" logUrlOnStart="true" />
-      <webAppContext contextPath="/fileserver" resourceBase="${activemq.base}/webapps/fileserver" logUrlOnStart="true" />
-    </handlers>
-  </jetty>
+        <handlers>
+            <webAppContext contextPath="/admin" resourceBase="${activemq.base}/webapps/admin" logUrlOnStart="true"/>
+            <webAppContext contextPath="/demo" resourceBase="${activemq.base}/webapps/demo" logUrlOnStart="true"/>
+            <webAppContext contextPath="/fileserver" resourceBase="${activemq.base}/webapps/fileserver" logUrlOnStart="true"/>
+        </handlers>
+    </jetty>
 
+    <!--  This xbean configuration file supports all the standard spring xml configuration options -->
 
-  
-  <!--  This xbean configuration file supports all the standard spring xml configuration options -->
-  
-  <!-- Postgres DataSource Sample Setup -->
-  <!-- 
-  <bean id="postgres-ds" class="org.postgresql.ds.PGPoolingDataSource">
-    <property name="serverName" value="localhost"/>
-    <property name="databaseName" value="activemq"/>
-    <property name="portNumber" value="0"/>
-    <property name="user" value="activemq"/>
-    <property name="password" value="activemq"/>
-    <property name="dataSourceName" value="postgres"/>
-    <property name="initialConnections" value="1"/>
-    <property name="maxConnections" value="10"/>
-  </bean>
-  -->
-  
-  <!-- MySql DataSource Sample Setup -->
-  <!-- 
-  <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-    <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-    <property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/>
-    <property name="username" value="activemq"/>
-    <property name="password" value="activemq"/>
-    <property name="maxActive" value="200"/>
-    <property name="poolPreparedStatements" value="true"/>
-  </bean>
-  -->  
-   
-  <!-- Oracle DataSource Sample Setup -->
-  <!--
-  <bean id="oracle-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-    <property name="driverClassName" value="oracle.jdbc.driver.OracleDriver"/>
-    <property name="url" value="jdbc:oracle:thin:@localhost:1521:AMQDB"/>
-    <property name="username" value="scott"/>
-    <property name="password" value="tiger"/>
-    <property name="maxActive" value="200"/>
-    <property name="poolPreparedStatements" value="true"/>
-  </bean>
-  -->
-        
-  <!-- Embedded Derby DataSource Sample Setup -->
-  <!-- 
-  <bean id="derby-ds" class="org.apache.derby.jdbc.EmbeddedDataSource">
-    <property name="databaseName" value="derbydb"/>
-    <property name="createDatabase" value="create"/>
-  </bean>
-  -->  
+    <!-- Postgres DataSource Sample Setup -->
+    <!--
+    <bean id="postgres-ds" class="org.postgresql.ds.PGPoolingDataSource">
+      <property name="serverName" value="localhost"/>
+      <property name="databaseName" value="activemq"/>
+      <property name="portNumber" value="0"/>
+      <property name="user" value="activemq"/>
+      <property name="password" value="activemq"/>
+      <property name="dataSourceName" value="postgres"/>
+      <property name="initialConnections" value="1"/>
+      <property name="maxConnections" value="10"/>
+    </bean>
+    -->
+
+    <!-- MySql DataSource Sample Setup -->
+    <!--
+    <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+      <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
+      <property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/>
+      <property name="username" value="activemq"/>
+      <property name="password" value="activemq"/>
+      <property name="maxActive" value="200"/>
+      <property name="poolPreparedStatements" value="true"/>
+    </bean>
+    -->
+
+    <!-- Oracle DataSource Sample Setup -->
+    <!--
+    <bean id="oracle-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+      <property name="driverClassName" value="oracle.jdbc.driver.OracleDriver"/>
+      <property name="url" value="jdbc:oracle:thin:@localhost:1521:AMQDB"/>
+      <property name="username" value="scott"/>
+      <property name="password" value="tiger"/>
+      <property name="maxActive" value="200"/>
+      <property name="poolPreparedStatements" value="true"/>
+    </bean>
+    -->
+
+    <!-- Embedded Derby DataSource Sample Setup -->
+    <!--
+    <bean id="derby-ds" class="org.apache.derby.jdbc.EmbeddedDataSource">
+      <property name="databaseName" value="derbydb"/>
+      <property name="createDatabase" value="create"/>
+    </bean>
+    -->
 
 </beans>
 <!-- END SNIPPET: example -->
diff --git a/assembly/src/release/example/conf/activemq.xml b/assembly/src/release/example/conf/activemq.xml
index 93498585e0..cbce57f013 100644
--- a/assembly/src/release/example/conf/activemq.xml
+++ b/assembly/src/release/example/conf/activemq.xml
@@ -15,7 +15,14 @@
     limitations under the License.
 -->
 <!-- START SNIPPET: xbean -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  xmlns:amq="http://activemq.org/config/1.0"
+  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.org/config/1.0 http://activemq.apache.org/schema/core/activemq-core-VERSION.xsd
+  http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
+
   
   <broker xmlns="http://activemq.org/config/1.0" useJmx="false">
 
@@ -24,8 +31,7 @@
     </persistenceAdapter>
   
     <transportConnectors>
-      <transportConnector uri="tcp://localhost:61616"/>
-      
+      <transportConnector uri="tcp://localhost:61616"/>      
       <transportConnector uri="stomp://localhost:61613"/>
     </transportConnectors>