resolve test failures, all test xml must now validae post https://issues.apache.org/activemq/browse/AMQ-2547 - upgrading trunk to spring 3.0.1.RELEASE

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@916937 13f79535-47bb-0310-9956-ffa450edef68

activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java

@@ -116,6 +116,9 @@ public class JournalPersistenceAdapter implements PersistenceAdapter, JournalEve
 
     private TaskRunnerFactory taskRunnerFactory;
 
+    public JournalPersistenceAdapter() {        
+    }
+    
     public JournalPersistenceAdapter(Journal journal, PersistenceAdapter longTermPersistence, TaskRunnerFactory taskRunnerFactory) throws IOException {
         setJournal(journal);
         setTaskRunnerFactory(taskRunnerFactory);

activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapterFactory.java

@@ -35,6 +35,7 @@ import org.apache.commons.logging.LogFactory;
 /**
  * Factory class that can create PersistenceAdapter objects.
  * 
+ * @org.apache.xbean.XBean
  * @version $Revision: 1.4 $
  */
 public class JournalPersistenceAdapterFactory extends DataSourceSupport implements PersistenceAdapterFactory {

activemq-core/src/main/java/org/apache/activemq/usage/Usage.java

@@ -202,6 +202,7 @@ public abstract class Usage<T extends Usage> implements Service {
      * before a UsageListener event is fired by the manager.
      * 
      * @param percentUsageMinDelta
+     * @org.apache.xbean.Property propertyEditor="org.apache.activemq.util.MemoryPropertyEditor"
      */
     public void setPercentUsageMinDelta(int percentUsageMinDelta) {
         if (percentUsageMinDelta < 1) {

activemq-core/src/test/resources/activemq.xml

@@ -16,19 +16,25 @@
     limitations under the License.
 -->
 <!-- START SNIPPET: xbean -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
+ 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker useJmx="false"  xmlns="http://activemq.apache.org/schema/core" persistent="false">
   
-    <transportConnectors>
-      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default"/>
-    </transportConnectors>
-    
     <networkConnectors>
       <networkConnector uri="multicast://default"/>
     </networkConnectors>
-    
+
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default"/>
+    </transportConnectors>
+        
   </broker>
   
 </beans>

activemq-core/src/test/resources/org/apache/activemq/broker/destinations-on-start.xml

@@ -18,7 +18,12 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
 

activemq-core/src/test/resources/org/apache/activemq/broker/ft/master.xml

@@ -15,7 +15,13 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker brokerName="master" useJmx="false" deleteAllMessagesOnStartup="true"  xmlns="http://activemq.apache.org/schema/core">

activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileMaster.xml

@@ -15,7 +15,13 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker brokerName="shared"  useJmx="false" deleteAllMessagesOnStartup="true"  xmlns="http://activemq.apache.org/schema/core">

activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileSlave.xml

@@ -15,7 +15,13 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker brokerName="shared" useJmx="false"  deleteAllMessagesOnStartup="true"  xmlns="http://activemq.apache.org/schema/core">

activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave.xml

@@ -15,7 +15,13 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker brokerName="slave" deleteAllMessagesOnStartup="true" useJmx="false" masterConnectorURI="tcp://localhost:62001"  xmlns="http://activemq.apache.org/schema/core">

activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave2.xml

@@ -15,20 +15,26 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <!-- START SNIPPET: example -->
   <broker brokerName="slave" useJmx="false"  deleteAllMessagesOnStartup="true"  xmlns="http://activemq.apache.org/schema/core">
   
-    <transportConnectors>
-      <transportConnector uri="tcp://localhost:62002"/>
-    </transportConnectors>
-    
     <services>
       <masterConnector remoteURI= "tcp://localhost:62001" userName="James" password="Cheese"/>
     </services>
 
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:62002"/>
+    </transportConnectors>
+    
   </broker>
   <!-- END SNIPPET: example -->
 

activemq-core/src/test/resources/org/apache/activemq/broker/policy/cursor.xml

@@ -17,7 +17,13 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker persistent="false" xmlns="http://activemq.apache.org/schema/core">
@@ -27,24 +33,26 @@
       <policyMap>
         <policyEntries>
           <policyEntry topic="org.apache.>" producerFlowControl="false" memoryLimit="1mb">
-            <dispatchPolicy>
+            
-              <strictOrderDispatchPolicy />
-            </dispatchPolicy>
             <deadLetterStrategy>
               <individualDeadLetterStrategy  topicPrefix="Test.DLQ." />
             </deadLetterStrategy>
+            <dispatchPolicy>
+              <strictOrderDispatchPolicy />
+            </dispatchPolicy>
             <pendingSubscriberPolicy>
             	<vmCursor />
             </pendingSubscriberPolicy>
           </policyEntry>
 
           <policyEntry queue="org.apache.>">
-            <dispatchPolicy>
+            
-              <strictOrderDispatchPolicy />
-            </dispatchPolicy>
             <deadLetterStrategy>
               <individualDeadLetterStrategy queuePrefix="Test.DLQ."/>
             </deadLetterStrategy>
+            <dispatchPolicy>
+              <strictOrderDispatchPolicy />
+            </dispatchPolicy>
             <pendingQueuePolicy>
             	<vmQueueCursor />
             </pendingQueuePolicy>

activemq-core/src/test/resources/org/apache/activemq/broker/policy/individual-dlq.xml

@@ -18,7 +18,13 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker persistent="false" xmlns="http://activemq.apache.org/schema/core">
@@ -28,21 +34,21 @@
       <policyMap>
         <policyEntries>
           <policyEntry topic="org.apache.>">
-            <dispatchPolicy>
-              <strictOrderDispatchPolicy />
-            </dispatchPolicy>
             <deadLetterStrategy>
               <individualDeadLetterStrategy  topicPrefix="Test.DLQ." processNonPersistent="true" />
             </deadLetterStrategy>
-          </policyEntry>
-
-          <policyEntry queue="org.apache.>">
             <dispatchPolicy>
               <strictOrderDispatchPolicy />
             </dispatchPolicy>
+          </policyEntry>
+
+          <policyEntry queue="org.apache.>">
             <deadLetterStrategy>
               <individualDeadLetterStrategy queuePrefix="Test.DLQ." processNonPersistent="true"/>
             </deadLetterStrategy>
+            <dispatchPolicy>
+              <strictOrderDispatchPolicy />
+            </dispatchPolicy>
           </policyEntry>
 
         </policyEntries>

activemq-core/src/test/resources/org/apache/activemq/broker/store/kahabroker.xml

@@ -15,17 +15,24 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
+
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker brokerName="broker" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
+    <persistenceAdapter>
+      <kahaPersistenceAdapter dir = "${basedir}/target/activemq-data/kaha-broker.db"  maxDataFileLength = "1024"/>
+    </persistenceAdapter>
+
      <transportConnectors>
       <transportConnector uri="tcp://localhost:0"/>
     </transportConnectors>
 
-    <persistenceAdapter>
-      <kahaPersistenceAdapter dir = "${basedir}/target/activemq-data/kaha-broker.db"  maxDataFileLength = "1024"/>
-    </persistenceAdapter>
   </broker>
 
 </beans>

activemq-core/src/test/resources/org/apache/activemq/broker/store/loadtester.xml

@@ -15,18 +15,25 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
+
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-  <usageManager id="memory-manager" limit="1048576"/> <!--  1 meg limit -->
+  <amq:systemUsage id="memory-manager">
+  	<amq:memoryUsage  limit="1048576"/> <!--  1 meg limit -->
+  </amq:systemUsage>
   
-  <broker useJmx="true" deleteAllMessagesOnStartup="true" memoryManager="#memory-manager"  xmlns="http://activemq.apache.org/schema/core">
+  <broker useJmx="true" deleteAllMessagesOnStartup="true" systemUsage="#memory-manager"  xmlns="http://activemq.apache.org/schema/core">
   
-    <persistenceAdapter>
+    <persistenceFactory>
-      <journaledJDBC 
+      <journalPersistenceAdapterFactory 
-      useQuickJournal="false"
+      useQuickJournal="false" journalLogFiles="2" dataDirectory="loadtest"/>
-      memManager="#memory-manager" journalLogFiles="2" dataDirectory="loadtest"/>
+    </persistenceFactory>
-    </persistenceAdapter>
   
     <transportConnectors>
       <transportConnector uri="tcp://localhost:0"/>

activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-queue.xml

@@ -18,7 +18,12 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
 

activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-topic.xml

@@ -18,7 +18,12 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
 

activemq-core/src/test/resources/org/apache/activemq/broker/virtual/filtered-queue.xml

@@ -18,7 +18,12 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
 

activemq-core/src/test/resources/org/apache/activemq/broker/virtual/global-virtual-topics.xml

@@ -18,7 +18,12 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
 

activemq-core/src/test/resources/org/apache/activemq/bugs/amq1095/activemq.xml

@@ -15,18 +15,24 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
   <broker brokerName="localhost" xmlns="http://activemq.apache.org/schema/core" persistent="true" deleteAllMessagesOnStartup="true">
-  
-    <persistenceAdapter>
-      <kahaPersistenceAdapter directory="file:target/amq1095" maxDataFileLength="200000"/>
-    </persistenceAdapter>
 
     <destinations>
       <queue physicalName="unused"/>
       <topic physicalName="activemq.TestTopic"/>
     </destinations>
+  
+    <persistenceAdapter>
+      <kahaPersistenceAdapter directory="file:target/amq1095" maxDataFileLength="200000"/>
+    </persistenceAdapter>
+
 
   </broker>
 

activemq-core/src/test/resources/org/apache/activemq/config/config.xml

@@ -15,7 +15,12 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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">
 
   <broker brokerName="brokerXmlConfigHelper" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true" xmlns="http://activemq.apache.org/schema/core">
     <transportConnectors>

activemq-core/src/test/resources/org/apache/activemq/config/example.xml

@@ -15,8 +15,13 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns:amq="http://activemq.apache.org/schema/core">
+<beans
-
+  xmlns="http://www.springframework.org/schema/beans"
+  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">
+  
     <!-- normal ActiveMQ XML config which is less verbose & can be validated -->
     <amq:broker brokerName="brokerConfigTest" populateJMSXUserID="false"
         useLoggingForShutdownErrors="true" useJmx="true"
@@ -27,17 +32,6 @@
         || NOTE this config file is used for unit testing the configuration mechanism
         || it is not necessarily a good example of a config file! :)
         -->
-
-        <amq:transportConnectors>
-            <amq:transportConnector uri="tcp://localhost:61635"/>
-            <amq:transportConnector uri="tcp://localhost:61636"/>
-            <amq:transportConnector uri="tcp://localhost:61637"/>
-        </amq:transportConnectors>
-
-        <amq:networkConnectors>
-            <amq:networkConnector uri="static://(tcp://localhost:61616)"/>
-        </amq:networkConnectors>
-
         <amq:destinationPolicy>
             <amq:policyMap>
                 <amq:policyEntries>
@@ -76,23 +70,34 @@
             </amq:policyMap>
         </amq:destinationPolicy>
 
+        <amq:networkConnectors>
+            <amq:networkConnector uri="static://(tcp://localhost:61616)"/>
+        </amq:networkConnectors>
+
+        <amq:persistenceAdapter>
+            <amq:memoryPersistenceAdapter createTransactionStore="true"/>
+        </amq:persistenceAdapter>
+
         <amq:systemUsage>
             <amq:systemUsage>
 	            <amq:memoryUsage>
     	            <amq:memoryUsage limit="10 mb" percentUsageMinDelta="20"/>
 	            </amq:memoryUsage>
-	            <amq:tempUsage>
-    	            <amq:tempUsage limit="100 mb"/>
-	            </amq:tempUsage>
 	            <amq:storeUsage>
     	            <amq:storeUsage limit="1 gb" name="foo"/>
 	            </amq:storeUsage>
+	            <amq:tempUsage>
+    	            <amq:tempUsage limit="100 mb"/>
+	            </amq:tempUsage>
             </amq:systemUsage>
         </amq:systemUsage>
 
-        <amq:persistenceAdapter>
+        <amq:transportConnectors>
-            <amq:memoryPersistenceAdapter init-method="createTransactionStore"/>
+            <amq:transportConnector uri="tcp://localhost:61635"/>
-        </amq:persistenceAdapter>
+            <amq:transportConnector uri="tcp://localhost:61636"/>
+            <amq:transportConnector uri="tcp://localhost:61637"/>
+        </amq:transportConnectors>
+
 
     </amq:broker>
 

activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml

@@ -15,14 +15,15 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns:amq="http://activemq.apache.org/schema/core">
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
     <amq:broker brokerName="brokerJdbcConfigTest" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true">
 
-        <amq:transportConnectors>
-            <amq:transportConnector uri="tcp://localhost:61635"/>
-        </amq:transportConnectors>
-
         <amq:persistenceAdapter>
             <amq:jdbcPersistenceAdapter>
                 <property name="cleanupPeriod" value="60000"/>
@@ -32,6 +33,11 @@
                 </property>
             </amq:jdbcPersistenceAdapter>
         </amq:persistenceAdapter>
+
+        <amq:transportConnectors>
+            <amq:transportConnector uri="tcp://localhost:61635"/>
+        </amq:transportConnectors>
+
     </amq:broker>
 
     <!-- ==================================================================== -->

activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/journal-example.xml

@@ -15,29 +15,35 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns:amq="http://activemq.apache.org/schema/core">
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
-    <amq:broker brokerName="brokerJournalConfigTest" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true">
+    <amq:broker brokerName="brokerJournalConfigTest" persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true">
+
+        <amq:persistenceAdapter>
+            <amq:journalPersistenceAdapter>
+                <amq:journal>
+                    <ref bean="myJournalImpl"/>
+                </amq:journal>
+
+                <amq:persistenceAdapter>
+                    <amq:memoryPersistenceAdapter createTransactionStore="true"/>
+                </amq:persistenceAdapter>
+
+                <amq:taskRunnerFactory>
+                    <bean id="myTaskRunnerFactory" class="org.apache.activemq.thread.TaskRunnerFactory"/>
+                </amq:taskRunnerFactory>
+            </amq:journalPersistenceAdapter>
+        </amq:persistenceAdapter>
 
         <amq:transportConnectors>
             <amq:transportConnector uri="tcp://localhost:61635"/>
         </amq:transportConnectors>
 
-        <amq:persistenceAdapter>
-            <amq:journalPersistenceAdapter>
-                <constructor-arg index="0">
-                    <ref bean="myJournalImpl"/>
-                </constructor-arg>
-
-                <constructor-arg index="1">
-                    <amq:memoryPersistenceAdapter init-method="createTransactionStore"/>
-                </constructor-arg>
-
-                <constructor-arg index="2">
-                    <bean id="myTaskRunnerFactory" class="org.apache.activemq.thread.TaskRunnerFactory"/>
-                </constructor-arg>
-            </amq:journalPersistenceAdapter>
-        </amq:persistenceAdapter>
     </amq:broker>
 
     <!-- The journal implementation that will be used -->

activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/journaledjdbc-example.xml

@@ -16,16 +16,21 @@
     limitations under the License.
 -->
 
-<beans xmlns:amq="http://activemq.apache.org/schema/core">
+<beans
-
+  xmlns="http://www.springframework.org/schema/beans"
-    <amq:broker brokerName="brokerJournaledJDBCConfigTest" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true">
+  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">
 
+    <amq:broker brokerName="brokerJournaledJDBCConfigTest" persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true">
+	
+	    <amq:persistenceFactory>
+           <amq:journalPersistenceAdapterFactory journalLogFiles="4" journalLogFileSize="32768" dataDirectory="target/test-data/testJournaledJDBCConfig" />
+        </amq:persistenceFactory>
         <amq:transportConnectors>
             <amq:transportConnector uri="tcp://localhost:61635"/>
         </amq:transportConnectors>
 
-        <amq:persistenceAdapter>
-            <amq:journaledJDBC journalLogFiles="4" journalLogFileSize="32768" dataDirectory="target/test-data/testJournaledJDBCConfig" />
-        </amq:persistenceAdapter>
     </amq:broker>
 </beans>

activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/memory-example.xml

@@ -16,16 +16,22 @@
     limitations under the License.
 -->
 
-<beans xmlns:amq="http://activemq.apache.org/schema/core">
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
     <amq:broker brokerName="brokerMemoryConfigTest" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true">
 
+        <amq:persistenceAdapter>
+            <amq:memoryPersistenceAdapter createTransactionStore = "true"/>
+        </amq:persistenceAdapter>
+
         <amq:transportConnectors>
             <amq:transportConnector uri="tcp://localhost:61635"/>
         </amq:transportConnectors>
 
-        <amq:persistenceAdapter>
-            <amq:memoryPersistenceAdapter init-method="createTransactionStore"/>
-        </amq:persistenceAdapter>
     </amq:broker>
 </beans>

activemq-core/src/test/resources/org/apache/activemq/memory/activemq.xml

@@ -36,12 +36,12 @@
 			<memoryUsage>
 		    	<memoryUsage limit="${limit}" percentUsageMinDelta="${delta}"/>
 			</memoryUsage>
-			<tempUsage>	
-		    	<tempUsage limit="100 mb"/>
-			</tempUsage>
 			<storeUsage>
 		    	<storeUsage limit="1 gb" name="foo"/>
 			</storeUsage>
+			<tempUsage>	
+		    	<tempUsage limit="100 mb"/>
+			</tempUsage>
 	    </systemUsage>
 	</systemUsage>
 

activemq-core/src/test/resources/org/apache/activemq/network/duplexLocalBroker.xml

@@ -15,30 +15,40 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
 <broker brokerName="localBroker" persistent="true" useShutdownHook="false" xmlns="http://activemq.apache.org/schema/core">
-    <transportConnectors>
-      <transportConnector uri="tcp://localhost:61616"/>
-    </transportConnectors>
-
     <networkConnectors>
-      <networkConnector uri="static:(tcp://localhost:61617)">
+      <networkConnector uri="static:(tcp://localhost:61617)"
-         duplex=true
+         duplex="true"
-         dynamicOnly = false
+         dynamicOnly = "false"
-         conduitSubscriptions = true
+         conduitSubscriptions = "true"
-         decreaseNetworkConsumerPriority = false
+         decreaseNetworkConsumerPriority = "false">
-      	<excludedDestinations>
+
-      		<queue physicalName="exclude.test.foo"/>
-      		<topic physicalName="exclude.test.bar"/>
-      	</excludedDestinations>
       	<dynamicallyIncludedDestinations>
       		<queue physicalName="include.test.foo"/>
       		<topic physicalName="include.test.bar"/>
       	</dynamicallyIncludedDestinations>
+
+      	<excludedDestinations>
+      		<queue physicalName="exclude.test.foo"/>
+      		<topic physicalName="exclude.test.bar"/>
+      	</excludedDestinations>
+
       </networkConnector>
     </networkConnectors>
+
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:61616"/>
+    </transportConnectors>
+
   </broker>
 </beans>
 

activemq-core/src/test/resources/org/apache/activemq/network/jms/queue-xbean.xml

@@ -15,7 +15,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
+
   <bean
     class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
 
@@ -33,9 +39,6 @@
   <!-- START SNIPPET: example -->
   <broker xmlns="http://activemq.apache.org/schema/core" id="localbroker"
     brokerName="localBroker" persistent="false">
-    <transportConnectors>
-      <transportConnector uri="tcp://localhost:61234" />
-    </transportConnectors>
 
     <jmsBridgeConnectors>
       <jmsQueueConnector
@@ -46,6 +49,11 @@
         </inboundQueueBridges>
       </jmsQueueConnector>
     </jmsBridgeConnectors>
+
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:61234" />
+    </transportConnectors>
+
   </broker>
 
   <!-- JMS ConnectionFactory to use remote -->
@@ -61,7 +69,4 @@
     <property name="brokerURL" value="tcp://localhost:61234" />
   </bean>
 
-</beans>
+</beans>
-
-
-

activemq-core/src/test/resources/org/apache/activemq/network/localBroker.xml

@@ -15,29 +15,35 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
 <broker brokerName="localBroker" persistent="true" useShutdownHook="false" monitorConnectionSplits="true" xmlns="http://activemq.apache.org/schema/core">
-    <transportConnectors>
-      <transportConnector uri="tcp://localhost:61616"/>
-    </transportConnectors>
-
     <networkConnectors>
-      <networkConnector uri="static:(tcp://localhost:61617)">
+      <networkConnector uri="static:(tcp://localhost:61617)"
-         dynamicOnly = false
+         dynamicOnly = "false"
-         conduitSubscriptions = true
+         conduitSubscriptions = "true"
-         decreaseNetworkConsumerPriority = false
+         decreaseNetworkConsumerPriority = "false">
-      	<excludedDestinations>
-      		<queue physicalName="exclude.test.foo"/>
-      		<topic physicalName="exclude.test.bar"/>
-      	</excludedDestinations>
       	<dynamicallyIncludedDestinations>
       		<queue physicalName="include.test.foo"/>
       		<topic physicalName="include.test.bar"/>
       	</dynamicallyIncludedDestinations>
+      	<excludedDestinations>
+      		<queue physicalName="exclude.test.foo"/>
+      		<topic physicalName="exclude.test.bar"/>
+      	</excludedDestinations>
       </networkConnector>
     </networkConnectors>
+    
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:61616"/>
+    </transportConnectors>
+    
   </broker>
 </beans>
 

activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker1.xml

@@ -15,7 +15,12 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker brokerName="broker1" persistent="false" useShutdownHook="false" useJmx="false"  xmlns="http://activemq.apache.org/schema/core">
@@ -32,14 +37,14 @@
       </policyEntries></policyMap>
     </destinationPolicy>
     
+    <networkConnectors>
+      <networkConnector uri="static:(tcp://localhost:61617)"/>
+    </networkConnectors>
+    
     <transportConnectors>
       <transportConnector uri="tcp://localhost:61616"/>
       <transportConnector uri="vm://broker1"/>
     </transportConnectors>
-
-    <networkConnectors>
-      <networkConnector uri="static:(tcp://localhost:61617)"/>
-    </networkConnectors>
     
   </broker>
   

activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker2.xml

@@ -15,7 +15,12 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker brokerName="broker2" persistent="false" useShutdownHook="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
@@ -32,14 +37,14 @@
       </policyEntries></policyMap>
     </destinationPolicy>
 
+    <networkConnectors>
+      <networkConnector uri="static:(tcp://localhost:61616)"/>
+    </networkConnectors>
+
     <transportConnectors>
       <transportConnector uri="tcp://localhost:61617"/>
       <transportConnector uri="vm://broker2"/>
     </transportConnectors>
-
-    <networkConnectors>
-      <networkConnector uri="static:(tcp://localhost:61616)"/>
-    </networkConnectors>
     
   </broker>
   

activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml

@@ -15,16 +15,23 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
+
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker brokerName="remoteBroker" useJmx="false" persistent="true" useShutdownHook="false" monitorConnectionSplits="true" xmlns="http://activemq.apache.org/schema/core">
-    <transportConnectors>
-      <transportConnector uri="tcp://localhost:61617"/>
-    </transportConnectors>
     <networkConnectors>
       <networkConnector uri="static:(tcp://localhost:61616)" />
       </networkConnectors>
+
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:61617"/>
+    </transportConnectors>
   </broker>
 
 </beans>

activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker1.xml

@@ -15,7 +15,12 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker brokerName="broker1" persistent="false" useShutdownHook="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
@@ -32,14 +37,15 @@
       </policyEntries></policyMap>
     </destinationPolicy>
     
+    <networkConnectors>
+      <networkConnector uri="static:(tcp://localhost:60007)"/>
+    </networkConnectors>
+
     <transportConnectors>
       <transportConnector uri="tcp://localhost:61616"/>
       <transportConnector uri="vm://broker1"/>
     </transportConnectors>
 
-    <networkConnectors>
-      <networkConnector uri="static:(tcp://localhost:60007)"/>
-    </networkConnectors>
     
   </broker>
   

activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker2.xml

@@ -15,7 +15,12 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker brokerName="broker2" persistent="false" useShutdownHook="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
@@ -32,14 +37,15 @@
       </policyEntries></policyMap>
     </destinationPolicy>
     
-    <transportConnectors>
-      <transportConnector uri="tcp://localhost:61617"/>
-      <transportConnector uri="vm://broker2"/>
-    </transportConnectors>
 
     <networkConnectors>
       <networkConnector uri="static:(tcp://localhost:60006)"/>
     </networkConnectors>
+
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:61617"/>
+      <transportConnector uri="vm://broker2"/>
+    </transportConnectors>
     
   </broker>
   

activemq-core/src/test/resources/org/apache/activemq/security/broker1.xml

@@ -24,19 +24,7 @@
   
   <broker xmlns="http://activemq.apache.org/schema/core" brokerName="broker1" useJmx="false" persistent="false">
 
-    <sslContext>
-        <sslContext keyStore="org/apache/activemq/security/broker1.ks"
-                    keyStorePassword="password"
-                    trustStore="org/apache/activemq/security/broker1.ts"
-                    trustStorePassword="password"/>
-    </sslContext>
-
   
-    <!-- The transport connectors ActiveMQ will listen to -->
-    <transportConnectors>
-       <transportConnector name="ssl" uri="ssl://0.0.0.0:61617?transport.closeAsync=false&amp;wantClientAuth=true&amp;needClientAuth=true"/>
-    </transportConnectors>
-
     <networkConnectors>
       <networkConnector uri="static://(ssl://localhost:61618)"
          name="tobackbone"
@@ -65,6 +53,19 @@
         </map>
       </authorizationPlugin>
     </plugins>
+
+    <sslContext>
+        <sslContext keyStore="org/apache/activemq/security/broker1.ks"
+                    keyStorePassword="password"
+                    trustStore="org/apache/activemq/security/broker1.ts"
+                    trustStorePassword="password"/>
+    </sslContext>
+
+    <!-- The transport connectors ActiveMQ will listen to -->
+    <transportConnectors>
+       <transportConnector name="ssl" uri="ssl://0.0.0.0:61617?transport.closeAsync=false&amp;wantClientAuth=true&amp;needClientAuth=true"/>
+    </transportConnectors>
+
   </broker>
   
 </beans>

activemq-core/src/test/resources/org/apache/activemq/security/broker2.xml

@@ -24,20 +24,7 @@
   
   <broker xmlns="http://activemq.apache.org/schema/core" brokerName="broker2" useJmx="false" persistent="false">
 
-    <sslContext>
+    <plugins>
-        <sslContext keyStore="org/apache/activemq/security/broker2.ks"
-                    keyStorePassword="password"
-                    trustStore="org/apache/activemq/security/broker2.ts"
-                    trustStorePassword="password"/>
-    </sslContext>
-
-
-    <!-- The transport connectors ActiveMQ will listen to -->
-    <transportConnectors>
-       <transportConnector name="ssl"     uri="ssl://0.0.0.0:61618?transport.closeAsync=false&amp;wantClientAuth=true&amp;needClientAuth=true"/>
-    </transportConnectors>
-
- <plugins>
       <jaasCertificateAuthenticationPlugin configuration="broker2" />
 
       <authorizationPlugin>
@@ -56,6 +43,20 @@
       </authorizationPlugin>
     </plugins>
 
+
+    <sslContext>
+        <sslContext keyStore="org/apache/activemq/security/broker2.ks"
+                    keyStorePassword="password"
+                    trustStore="org/apache/activemq/security/broker2.ts"
+                    trustStorePassword="password"/>
+    </sslContext>
+
+
+    <!-- The transport connectors ActiveMQ will listen to -->
+    <transportConnectors>
+       <transportConnector name="ssl"     uri="ssl://0.0.0.0:61618?transport.closeAsync=false&amp;wantClientAuth=true&amp;needClientAuth=true"/>
+    </transportConnectors>
+
   </broker>
   
 </beans>

activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker.xml

@@ -18,7 +18,13 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: example -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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">
+
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker useJmx="false" persistent="false" xmlns="http://activemq.apache.org/schema/core" populateJMSXUserID="true">

activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml

@@ -18,19 +18,26 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: example -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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">
+
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker useJmx="true" persistent="false" xmlns="http://activemq.apache.org/schema/core" populateJMSXUserID="true">
-    <!-- Use a non-default port in case the default port is in use -->
-    <managementContext>
-      <managementContext connectorPort="1199"/>
-    </managementContext>
 
     <destinations>
       <queue physicalName="TEST.Q" />      
     </destinations> 
 
+    <!-- Use a non-default port in case the default port is in use -->
+    <managementContext>
+      <managementContext connectorPort="1199"/>
+    </managementContext>
+
     <plugins>
 		<simpleAuthenticationPlugin>
 			<users>

activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-buffer.xml

@@ -18,7 +18,13 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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">
+
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker persistent="false" xmlns="http://activemq.apache.org/schema/core">

activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-destination-buffer.xml

@@ -18,7 +18,13 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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">
+
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker persistent="false" xmlns="http://activemq.apache.org/schema/core">

activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-lastimage-policy.xml

@@ -18,7 +18,12 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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">
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 

activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-message-query.xml

@@ -18,7 +18,12 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans xmlns:s="http://xbean.org/spring/">
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 

activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-timed-policy.xml

@@ -18,7 +18,12 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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">
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 

activemq-core/src/test/resources/org/apache/activemq/transport/stomp/niostomp-auth-broker.xml

@@ -18,7 +18,13 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: example -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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">
+
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
   
   <bean class="org.apache.activemq.util.XStreamFactoryBean" name="xstream">
@@ -27,10 +33,6 @@
 
   <broker useJmx="true" persistent="false" xmlns="http://activemq.apache.org/schema/core" populateJMSXUserID="true">
 
-    <transportConnectors>
-      <transportConnector name="stomp+nio"   uri="stomp+nio://localhost:61612"/>
-    </transportConnectors>
-
     <plugins>
 		<simpleAuthenticationPlugin>
 			<users>
@@ -62,6 +64,12 @@
         </map>
       </authorizationPlugin>
     </plugins>
+    
+    <transportConnectors>
+      <transportConnector name="stomp+nio"   uri="stomp+nio://localhost:61612"/>
+    </transportConnectors>
+
+    
   </broker>
 
 </beans>

activemq-core/src/test/resources/org/apache/activemq/transport/stomp/sslstomp-auth-broker.xml

@@ -18,7 +18,13 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: example -->
-<beans>
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  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">
+
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
   
   <bean class="org.apache.activemq.util.XStreamFactoryBean" name="xstream">
@@ -27,10 +33,6 @@
 
   <broker start="false" useJmx="true" persistent="false" xmlns="http://activemq.apache.org/schema/core" populateJMSXUserID="true">
 
-    <transportConnectors>
-      <transportConnector name="stomp+ssl"   uri="stomp+ssl://localhost:61612"/>
-    </transportConnectors>
-
     <plugins>
 		<simpleAuthenticationPlugin>
 			<users>
@@ -62,6 +64,12 @@
         </map>
       </authorizationPlugin>
     </plugins>
+    
+    <transportConnectors>
+      <transportConnector name="stomp+ssl"   uri="stomp+ssl://localhost:61612"/>
+    </transportConnectors>
+
+    
   </broker>
 
 </beans>

activemq-core/src/test/resources/org/apache/activemq/transport/stomp/sslstomp-mutual-auth-broker.xml

@@ -32,17 +32,6 @@
   <!--  lets create an embedded ActiveMQ Broker -->
   <amq:broker useJmx="true" persistent="false" start="false">
 
-    <amq:sslContext>
-      <amq:sslContext 
-      		keyStore="server.keystore" keyStorePassword="password"
-      		trustStore="client.keystore" trustStorePassword="password"/>
-    </amq:sslContext>
-    
-    <amq:transportConnectors>
-      <amq:transportConnector name="stomp+ssl"   uri="stomp+ssl://localhost:61612?needClientAuth=true"/>
-      <amq:transportConnector name="ssl"   uri="ssl://localhost:61617?needClientAuth=true"/>
-    </amq:transportConnectors>
-    
      <amq:plugins>
 		<amq:jaasCertificateAuthenticationPlugin configuration="cert-login"/>
 		
@@ -70,7 +59,18 @@
 			</amq:map>
       </amq:authorizationPlugin>
 	</amq:plugins>
-	
+
+    <amq:sslContext>
+      <amq:sslContext 
+      		keyStore="server.keystore" keyStorePassword="password"
+      		trustStore="client.keystore" trustStorePassword="password"/>
+    </amq:sslContext>
+    
+    <amq:transportConnectors>
+      <amq:transportConnector name="stomp+ssl"   uri="stomp+ssl://localhost:61612?needClientAuth=true"/>
+      <amq:transportConnector name="ssl"   uri="ssl://localhost:61617?needClientAuth=true"/>
+    </amq:transportConnectors>
+    	
   </amq:broker>
   
 </beans>

activemq-core/src/test/resources/org/apache/activemq/transport/stomp/stomp-auth-broker.xml

@@ -18,7 +18,13 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: example -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
+
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
   
   <bean class="org.apache.activemq.util.XStreamFactoryBean" name="xstream">
@@ -27,10 +33,6 @@
 
   <broker useJmx="true" persistent="false" xmlns="http://activemq.apache.org/schema/core" populateJMSXUserID="true">
 
-	<transportConnectors>
-		<transportConnector name="stomp"   uri="stomp://localhost:61613"/>
-	</transportConnectors>
-
     <plugins>
 		<simpleAuthenticationPlugin>
 			<users>
@@ -62,6 +64,11 @@
         </map>
       </authorizationPlugin>
     </plugins>
+    
+    <transportConnectors>
+		<transportConnector name="stomp"   uri="stomp://localhost:61613"/>
+	</transportConnectors>
+    
   </broker>
 
 </beans>

activemq-core/src/test/resources/org/apache/activemq/usecases/activemq.xml

@@ -15,7 +15,12 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
   
   <broker useJmx="true" xmlns="http://activemq.apache.org/schema/core">
 
@@ -42,19 +47,6 @@
       </policyEntries></policyMap>
     </destinationPolicy>
   
-  
-    <persistenceAdapter>
-      <journaledJDBC journalLogFiles="5" dataDirectory="../data"/>
-      <!-- To use a different datasource, use th following syntax : -->
-      <!-- 
-      <journaledJDBC journalLogFiles="5" dataDirectory="../data" dataSource="#postgres-ds"/>
-       -->
-    </persistenceAdapter>
-  
-    <transportConnectors>
-       <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
-    </transportConnectors>
-    
     <networkConnectors>
       <!-- by default just auto discover the other brokers -->
       <networkConnector uri="multicast://default"/>
@@ -62,7 +54,19 @@
       <networkConnector uri="static://(tcp://host1:61616,tcp://host2:61616)"/>
       -->
     </networkConnectors>
-    
+  
+    <persistenceFactory>
+      <journalPersistenceAdapterFactory journalLogFiles="5" dataDirectory="../data"/>
+      <!-- To use a different datasource, use the following syntax : -->
+      <!-- 
+      <journalPersistenceAdapterFactory journalLogFiles="5" dataDirectory="../data" dataSource="#postgres-ds"/>
+       -->
+    </persistenceFactory>
+  
+    <transportConnectors>
+       <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
+    </transportConnectors>
+        
   </broker>
   
   <!--  This xbean configuration file supports all the standard spring xml configuration options -->

activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml

@@ -15,14 +15,17 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
+
   
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker brokerName="BrokerA" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
-    <transportConnectors>
-      <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default?group=${groupId}"/>
-    </transportConnectors>
 
     <networkConnectors>
       <networkConnector uri="multicast://default?group=${groupId}"/>
@@ -31,6 +34,11 @@
     <persistenceAdapter>
       <memoryPersistenceAdapter/>
     </persistenceAdapter>
+
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default?group=${groupId}"/>
+    </transportConnectors>
+
   </broker>
 
 </beans>

activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml

@@ -15,14 +15,17 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
+
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker brokerName="BrokerB" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
-    <transportConnectors>
-      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default?group=${groupId}"/>
-    </transportConnectors>
 
     <networkConnectors>
       <networkConnector uri="multicast://default?group=${groupId}"/>
@@ -31,6 +34,11 @@
     <persistenceAdapter>
       <memoryPersistenceAdapter/>
     </persistenceAdapter>
+
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default?group=${groupId}"/>
+    </transportConnectors>
+
   </broker>
 
 </beans>

activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml

@@ -15,14 +15,16 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker brokerName="receiver" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
-    <transportConnectors>
-      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default?group=${groupId}"/>
-    </transportConnectors>
 
     <networkConnectors>
       <networkConnector uri="multicast://default?group=${groupId}"/>
@@ -31,6 +33,11 @@
     <persistenceAdapter>
       <memoryPersistenceAdapter/>
     </persistenceAdapter>
+
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default?group=${groupId}"/>
+    </transportConnectors>
+
   </broker>
 
 </beans>

activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-duplex.xml

@@ -14,30 +14,28 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans
+<beans 
-  xmlns="http://www.springframework.org/schema/beans"
+  xmlns="http://www.springframework.org/schema/beans" 
-  xmlns:amq="http://activemq.org/config/1.0"
+  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.org/config/1.0 http://activemq.apache.org/schema/activemq-core.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
-  http://camel.apache.org/schema/spring http://camel.apache.org/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 brokerName="receiver" persistent="false" useJmx="true" xmlns="http://activemq.apache.org/schema/core" >
-  <broker brokerName="receiver" persistent="false" useJmx="true" xmlns="http://activemq.org/config/1.0" >
   
     
 
+    <!-- The store and forward broker networks ActiveMQ will listen to -->
+    <networkConnectors>
+    </networkConnectors>
+
     <!-- The transport connectors ActiveMQ will listen to -->
     <transportConnectors>
        <transportConnector uri="tcp://localhost:62002"/>
     </transportConnectors>
 
-    <!-- The store and forward broker networks ActiveMQ will listen to -->
-    <networkConnectors>
-    </networkConnectors>
-
     
   </broker>
 

activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-http.xml

@@ -15,13 +15,15 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
+
 
   <broker brokerName="receiver" persistent="false" xmlns="http://activemq.apache.org/schema/core">
-    <transportConnectors>
-      <transportConnector uri="http://localhost:62302"/>
-    </transportConnectors>
-
     <networkConnectors>
       <networkConnector uri="static:(http://localhost:62301)"/>
     </networkConnectors>
@@ -29,6 +31,11 @@
     <persistenceAdapter>
       <memoryPersistenceAdapter/>
     </persistenceAdapter>
+
+    <transportConnectors>
+      <transportConnector uri="http://localhost:62302"/>
+    </transportConnectors>
+
   </broker>
 
 </beans>

activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-zeroconf.xml

@@ -16,7 +16,12 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
   <broker name="receiver">
     <connector>

activemq-core/src/test/resources/org/apache/activemq/usecases/receiver.xml

@@ -15,12 +15,14 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
   <broker brokerName="receiver" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
-    <transportConnectors>
-      <transportConnector uri="tcp://localhost:62002"/>
-    </transportConnectors>
 
     <networkConnectors>
       <networkConnector uri="static:(tcp://localhost:62001)"/>
@@ -29,6 +31,11 @@
     <persistenceAdapter>
       <memoryPersistenceAdapter/>
     </persistenceAdapter>
+
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:62002"/>
+    </transportConnectors>
+
   </broker>
 
 </beans>

activemq-core/src/test/resources/org/apache/activemq/usecases/sender-activecluster.xml

@@ -16,7 +16,12 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
   <broker name="sender">
     <connector>

activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml

@@ -15,14 +15,16 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker brokerName="sender" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
-    <transportConnectors>
-      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default?group=${groupId}"/>
-    </transportConnectors>
 
     <networkConnectors>
       <networkConnector uri="multicast://default?group=${groupId}"/>
@@ -31,6 +33,11 @@
     <persistenceAdapter>
       <memoryPersistenceAdapter/>
     </persistenceAdapter>
+
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default?group=${groupId}"/>
+    </transportConnectors>
+
   </broker>
 
 </beans>

activemq-core/src/test/resources/org/apache/activemq/usecases/sender-duplex.xml

@@ -14,49 +14,45 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans
+<beans 
-  xmlns="http://www.springframework.org/schema/beans"
+  xmlns="http://www.springframework.org/schema/beans" 
-  xmlns:amq="http://activemq.org/config/1.0"
+  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.org/config/1.0 http://activemq.apache.org/schema/activemq-core.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
-  http://camel.apache.org/schema/spring http://camel.apache.org/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 brokerName="sender" persistent="false" useJmx="true" xmlns="http://activemq.org/config/1.0" > <!-- dataDirectory="${activemq.base}/data"> -->
+  <broker brokerName="sender" persistent="false" useJmx="true" xmlns="http://activemq.apache.org/schema/core" > <!-- dataDirectory="${activemq.base}/data"> -->
   
    
+    <!-- The store and forward broker networks ActiveMQ will listen to -->
+    <networkConnectors>
+      <!-- by default just auto discover the other brokers -->
+      <networkConnector name="monitoring" uri="static:(tcp://localhost:62002)" duplex="true" >
+      	<dynamicallyIncludedDestinations>
+      		<queue physicalName="include.test.foo"/>
+      		<topic physicalName="include.test.bar"/>
+      	</dynamicallyIncludedDestinations>
+        <excludedDestinations>
+      		<queue physicalName="exclude.test.foo"/>
+      		<topic physicalName="exclude.test.bar"/>
+      	</excludedDestinations>
+        <staticallyIncludedDestinations>
+      		<queue physicalName="always.include.queue"/>
+      		<topic physicalName="always.include.topic"/>
+      	</staticallyIncludedDestinations>
+
+      </networkConnector>
+    </networkConnectors>
+
 
 
     <!-- The transport connectors ActiveMQ will listen to -->
     <transportConnectors>
        <transportConnector uri="tcp://localhost:62001"/>
     </transportConnectors>
-
-    <!-- The store and forward broker networks ActiveMQ will listen to -->
-    <networkConnectors>
-      <!-- by default just auto discover the other brokers -->
-      <networkConnector name="monitoring" uri="static:(tcp://localhost:62002)" duplex="true" >
-        <excludedDestinations>
-      		<queue physicalName="exclude.test.foo"/>
-      		<topic physicalName="exclude.test.bar"/>
-      	</excludedDestinations>
-      	<dynamicallyIncludedDestinations>
-      		<queue physicalName="include.test.foo"/>
-      		<topic physicalName="include.test.bar"/>
-      	</dynamicallyIncludedDestinations>
-        <staticallyIncludedDestinations>
-      		<queue physicalName="always.include.queue"/>
-      		<topic physicalName="always.include.topic"/>
-      	</staticallyIncludedDestinations>
-
-
-
-      </networkConnector>
-    </networkConnectors>
-
   
       
   </broker>

activemq-core/src/test/resources/org/apache/activemq/usecases/sender-http.xml

@@ -15,7 +15,12 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
   <broker brokerName="sender" persistent="false" xmlns="http://activemq.apache.org/schema/core">
     <transportConnectors>

activemq-core/src/test/resources/org/apache/activemq/usecases/sender-zeroconf.xml

@@ -16,7 +16,12 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
   <broker name="sender">
     <connector>

activemq-core/src/test/resources/org/apache/activemq/usecases/sender.xml

@@ -15,12 +15,14 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
   <broker brokerName="sender" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
-    <transportConnectors>
-      <transportConnector uri="tcp://localhost:62001"/>
-    </transportConnectors>
 
     <networkConnectors>
       <networkConnector uri="static:(tcp://localhost:62002)">
@@ -33,6 +35,11 @@
     <persistenceAdapter>
       <memoryPersistenceAdapter/>
     </persistenceAdapter>
+
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:62001"/>
+    </transportConnectors>
+
   </broker>
 
 </beans>

activemq-core/src/test/resources/org/apache/activemq/util/plugin-broker.xml

@@ -18,7 +18,13 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
+
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker useJmx="false" persistent="false" xmlns="http://activemq.apache.org/schema/core">

activemq-core/src/test/resources/org/apache/activemq/xbean/activemq-policy.xml

@@ -18,7 +18,12 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
@@ -48,15 +53,17 @@
           </policyEntry>
 
           <policyEntry topic="PRICES.>">
+
+            <!-- lets force old messages to be discarded for slow consumers -->
+            <pendingMessageLimitStrategy>
+              <constantPendingMessageLimitStrategy limit="10"/>
+            </pendingMessageLimitStrategy>
+
             <!--  10 seconds worth -->
             <subscriptionRecoveryPolicy>
               <timedSubscriptionRecoveryPolicy recoverDuration="10000" />
             </subscriptionRecoveryPolicy>
             
-            <!-- lets force old messages to be discarded for slow consumers -->
-            <pendingMessageLimitStrategy>
-              <constantPendingMessageLimitStrategy limit="10"/>
-            </pendingMessageLimitStrategy>
           </policyEntry>
         </policyEntries>
       </policyMap>

activemq-core/src/test/resources/org/apache/activemq/xbean/activemq.xml

@@ -18,31 +18,37 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: example -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker useJmx="true" xmlns="http://activemq.apache.org/schema/core">
 
-    <persistenceAdapter>
-      <journaledJDBC journalLogFiles="5" dataDirectory="${basedir}/target/foo" />
-      
-      <!-- To use a different dataSource, use the following syntax : -->
-      <!-- 
-      <journaledJDBC journalLogFiles="5" dataDirectory="${basedir}/activemq-data" dataSource="#mysql-ds"/>
-       -->
-    </persistenceAdapter>
-
-    <transportConnectors>
-      <transportConnector uri="tcp://localhost:61636" />
-    </transportConnectors>
-
     <networkConnectors>
       <!-- 
       <networkConnector uri="multicast://default?initialReconnectDelay=100" />
       <networkConnector uri="static://(tcp://localhost:61616)" />
        -->
     </networkConnectors>
+
+    <persistenceFactory>
+      <journalPersistenceAdapterFactory journalLogFiles="5" dataDirectory="${basedir}/target/foo" />
+      
+      <!-- To use a different dataSource, use the following syntax : -->
+      <!-- 
+      <journalPersistenceAdapterFactory journalLogFiles="5" dataDirectory="${basedir}/activemq-data" dataSource="#mysql-ds"/>
+       -->
+    </persistenceFactory>
+
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:61636" />
+    </transportConnectors>
+
   </broker>
 
   <!-- MySql DataSource Sample Setup -->

activemq-core/src/test/resources/org/apache/activemq/xbean/activemq2.xml

@@ -16,7 +16,12 @@
     limitations under the License.
 -->
 
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
@@ -39,19 +44,13 @@
     </destinationPolicy>
 
 
-    <persistenceAdapter>
+    <persistenceFactory>
-      <journaledJDBC journalLogFiles="5" dataDirectory="${basedir}/target/data" />
+      <journalPersistenceAdapterFactory journalLogFiles="5" dataDirectory="${basedir}/target/data" />
-    </persistenceAdapter>
+    </persistenceFactory>
 
     <transportConnectors>
       <transportConnector uri="tcp://localhost:61616" />
     </transportConnectors>
 
-<!-- 
-    <networkConnectors>
-      <networkConnector
-        uri="multicast://default?initialReconnectDelay=100" />
-    </networkConnectors>
- -->
   </broker>
 </beans>

activemq-core/src/test/resources/org/apache/activemq/xbean/connector-test.xml

@@ -18,30 +18,35 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker useJmx="true" xmlns="http://activemq.apache.org/schema/core">
 
-    <transportConnectors>
-      <transportConnector uri="tcp://localhost:61636" />
-    </transportConnectors>
 
     <networkConnectors>
       <networkConnector uri="static://(tcp://localhost:61616)">
-      	<excludedDestinations>
-      		<queue physicalName="exclude.test.foo"/>
-      		<topic physicalName="exclude.test.bar"/>
-      	</excludedDestinations>
       	<dynamicallyIncludedDestinations>
       		<queue physicalName="include.test.foo"/>
       		<topic physicalName="include.test.bar"/>
       	</dynamicallyIncludedDestinations>
+      	<excludedDestinations>
+      		<queue physicalName="exclude.test.foo"/>
+      		<topic physicalName="exclude.test.bar"/>
+      	</excludedDestinations>
       </networkConnector>
     </networkConnectors>
-	
 
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:61636" />
+    </transportConnectors>
+	
   </broker>
 
 </beans>

activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-test.xml

@@ -18,18 +18,23 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker useJmx="false" xmlns="http://activemq.apache.org/schema/core">
 
-    <persistenceAdapter>
+    <persistenceFactory>
-      <journaledJDBC useJournal="false">
+      <journalPersistenceAdapterFactory useJournal="false">
         <statements>
           <statements tablePrefix="BROKER1."/>
         </statements>
-      </journaledJDBC>
+      </journalPersistenceAdapterFactory>
-    </persistenceAdapter>
+    </persistenceFactory>
 
   </broker>
 

activemq-core/src/test/resources/org/apache/activemq/xbean/management-context-test.xml

@@ -18,7 +18,12 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans>
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  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">
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
 

activemq-core/src/test/resources/spring-embedded-xbean-bean-ref.xml

@@ -35,7 +35,7 @@
 
     </bean>
 
-    <amq:broker poor="false"
+    <amq:broker
           persistent="true"
           advisorySupport="false"
           dataDirectory="target/amqdata"