diff --git a/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml b/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
index b3295e3fc4..935d79ff59 100755
--- a/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
+++ b/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
@@ -14,45 +14,37 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<!-- START SNIPPET: xbean -->
+        <!-- START SNIPPET: xbean -->
 <beans>
-  
+
+
   <broker useJmx="true" xmlns="http://activemq.org/config/1.0">
-  
+
     <!--  Use the following to set the broker memory limit (in bytes)
   	<memoryManager>  
 	  	<usageManager id="memory-manager" limit="1048576"/>
   	</memoryManager>
   	-->
-  	
-	<!-- Use the following to configure how ActiveMQ is exposed in JMX
-	<managementContext>
-	   <managementContext connectorPort="1099" jmxDomainName="org.apache.activemq"/>
-	</managementContext>
-	-->
 
-	<!-- In ActiveMQ 4, you can setup destination policies -->  
+    <!-- In ActiveMQ 4, you can setup destination policies -->
     <destinationPolicy>
-      <policyMap><policyEntries>
-        
+      <policyMap>
+        <policyEntries>
+
           <policyEntry topic="FOO.>">
             <dispatchPolicy>
-              <strictOrderDispatchPolicy />
+              <strictOrderDispatchPolicy/>
             </dispatchPolicy>
             <subscriptionRecoveryPolicy>
-              <lastImageSubscriptionRecoveryPolicy />
+              <lastImageSubscriptionRecoveryPolicy/>
             </subscriptionRecoveryPolicy>
           </policyEntry>
 
-      </policyEntries></policyMap>
+        </policyEntries>
+      </policyMap>
     </destinationPolicy>
-  
-    <!--
-    <managementContext>
-      <managementContext findTigerMbeanServer="true"/>
-    </managementContext>
-    -->
-  
+
+
     <persistenceAdapter>
       <journaledJDBC journalLogFiles="5" dataDirectory="activemq-data"/>
       <!-- To use a different datasource, use th following syntax : -->
@@ -60,13 +52,13 @@
       <journaledJDBC journalLogFiles="5" dataDirectory="activemq-data" dataSource="#postgres-ds"/>
        -->
     </persistenceAdapter>
-  
+
     <transportConnectors>
-       <transportConnector name="openwire" uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
-       <transportConnector name="stomp"   uri="stomp://localhost:61613"/>
-       <transportConnector name="xmpp"   uri="xmpp://localhost:61222"/>
+      <transportConnector name="openwire" uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
+      <transportConnector name="stomp" uri="stomp://localhost:61613"/>
+      <transportConnector name="xmpp" uri="xmpp://localhost:61222"/>
     </transportConnectors>
-    
+
     <networkConnectors>
       <!-- by default just auto discover the other brokers -->
       <networkConnector name="defaultNetwork" uri="multicast://default"/>
@@ -74,11 +66,15 @@
       <networkConnector name="host1 and host2" uri="static://(tcp://host1:61616,tcp://host2:61616)" failover="true"/>
       -->
     </networkConnectors>
-    
+
   </broker>
-  
+
+  <!-- lets create a command agent to respond to admin commands over JMS or XMPP -->
+  <commandAgent xmlns="http://activemq.org/config/1.0"/>
+
+ 
   <!--  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">
@@ -92,7 +88,7 @@
     <property name="maxConnections" value="10"/>
   </bean>
   -->
-  
+
   <!-- MySql DataSource Sample Setup -->
   <!-- 
   <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
@@ -102,15 +98,15 @@
     <property name="password" value="activemq"/>
     <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: xbean -->
+        <!-- END SNIPPET: xbean -->