activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r918405 [1/2] - in /activemq/branches/activemq-5.3: activemq-console/src/test/resources/ activemq-core/src/main/java/org/apache/activemq/store/journal/ activemq-core/src/main/java/org/apache/activemq/usage/ activemq-core/src/test/resources/...
Date Wed, 03 Mar 2010 11:05:35 GMT
Author: gtully
Date: Wed Mar  3 11:05:34 2010
New Revision: 918405

URL: http://svn.apache.org/viewvc?rev=918405&view=rev
Log:
merge -c 916937, 917556 https://svn.apache.org/repos/asf/activemq/trunk - ensure config will validate, spring 3.0 enforces this so this allows easy compatibility

Modified:
    activemq/branches/activemq-5.3/activemq-console/src/test/resources/activemq.xml
    activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java
    activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapterFactory.java
    activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/usage/Usage.java
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/activemq.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/destinations-on-start.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/master.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileMaster.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileSlave.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave2.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/policy/cursor.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/policy/individual-dlq.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/store/kahabroker.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/store/loadtester.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-queue.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-topic.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/filtered-queue.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/global-virtual-topics.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/bugs/amq1095/activemq.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/config.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/example.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/journal-example.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/journaledjdbc-example.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/memory-example.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/memory/activemq.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/duplexLocalBroker.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/jms/queue-xbean.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/localBroker.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker1.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker2.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker1.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker2.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/security/broker1.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/security/broker2.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-buffer.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-destination-buffer.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-lastimage-policy.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-message-query.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-timed-policy.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/niostomp-auth-broker.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/sslstomp-auth-broker.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/sslstomp-mutual-auth-broker.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/stomp-auth-broker.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/usecases/activemq.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-duplex.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-http.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-zeroconf.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-activecluster.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-duplex.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-http.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-zeroconf.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/usecases/sender.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/util/plugin-broker.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq-policy.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq2.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/xbean/connector-test.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-test.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/xbean/management-context-test.xml
    activemq/branches/activemq-5.3/activemq-core/src/test/resources/spring-embedded-xbean-bean-ref.xml
    activemq/branches/activemq-5.3/activemq-rar/src/main/rar/broker-config.xml
    activemq/branches/activemq-5.3/assembly/src/release/example/conf/activemq.xml
    activemq/branches/activemq-5.3/assembly/src/sample-conf/activemq-demo.xml
    activemq/branches/activemq-5.3/assembly/src/sample-conf/quickJdbc-example.xml

Modified: activemq/branches/activemq-5.3/activemq-console/src/test/resources/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-console/src/test/resources/activemq.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-console/src/test/resources/activemq.xml (original)
+++ activemq/branches/activemq-5.3/activemq-console/src/test/resources/activemq.xml Wed Mar  3 11:05:34 2010
@@ -16,21 +16,26 @@
     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"/>
   
   <!-- Default configuration -->
   <broker useJmx="false" xmlns="http://activemq.apache.org/schema/core">
 	  
+	<persistenceFactory>
+	  <journalPersistenceAdapterFactory journalLogFiles="2" dataDirectory="target/foo"/>
+	</persistenceFactory>
+
 	<transportConnectors>
       <transportConnector uri="tcp://localhost:61616"/>
-    </transportConnectors>
-	  
-	<persistenceAdapter>
-	  <journaledJDBC journalLogFiles="2" dataDirectory="target/foo"/>
-	</persistenceAdapter>
-	  
+    </transportConnector>
+    	  
   </broker>
 
   <!-- Example of broker configuration that uses new logging options and dynamic management of logging

Modified: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java Wed Mar  3 11:05:34 2010
@@ -116,6 +116,9 @@
 
     private TaskRunnerFactory taskRunnerFactory;
 
+    public JournalPersistenceAdapter() {        
+    }
+    
     public JournalPersistenceAdapter(Journal journal, PersistenceAdapter longTermPersistence, TaskRunnerFactory taskRunnerFactory) throws IOException {
         setJournal(journal);
         setTaskRunnerFactory(taskRunnerFactory);

Modified: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapterFactory.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapterFactory.java?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapterFactory.java (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapterFactory.java Wed Mar  3 11:05:34 2010
@@ -35,6 +35,7 @@
 /**
  * Factory class that can create PersistenceAdapter objects.
  * 
+ * @org.apache.xbean.XBean
  * @version $Revision: 1.4 $
  */
 public class JournalPersistenceAdapterFactory extends DataSourceSupport implements PersistenceAdapterFactory {

Modified: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/usage/Usage.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/usage/Usage.java?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/usage/Usage.java (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/usage/Usage.java Wed Mar  3 11:05:34 2010
@@ -202,6 +202,7 @@
      * 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) {

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/activemq.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/activemq.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/activemq.xml Wed Mar  3 11:05:34 2010
@@ -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>

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/destinations-on-start.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/destinations-on-start.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/destinations-on-start.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/destinations-on-start.xml Wed Mar  3 11:05:34 2010
@@ -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" />
 

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/master.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/master.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/master.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/master.xml Wed Mar  3 11:05:34 2010
@@ -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">

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileMaster.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileMaster.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileMaster.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileMaster.xml Wed Mar  3 11:05:34 2010
@@ -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">

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileSlave.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileSlave.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileSlave.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileSlave.xml Wed Mar  3 11:05:34 2010
@@ -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">

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave.xml Wed Mar  3 11:05:34 2010
@@ -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">

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave2.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave2.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave2.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave2.xml Wed Mar  3 11:05:34 2010
@@ -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 -->
 

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/policy/cursor.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/policy/cursor.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/policy/cursor.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/policy/cursor.xml Wed Mar  3 11:05:34 2010
@@ -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>

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/policy/individual-dlq.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/policy/individual-dlq.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/policy/individual-dlq.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/policy/individual-dlq.xml Wed Mar  3 11:05:34 2010
@@ -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>

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/store/kahabroker.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/store/kahabroker.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/store/kahabroker.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/store/kahabroker.xml Wed Mar  3 11:05:34 2010
@@ -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>

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/store/loadtester.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/store/loadtester.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/store/loadtester.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/store/loadtester.xml Wed Mar  3 11:05:34 2010
@@ -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>
-      <journaledJDBC 
-      useQuickJournal="false"
-      memManager="#memory-manager" journalLogFiles="2" dataDirectory="loadtest"/>
-    </persistenceAdapter>
+    <persistenceFactory>
+      <journalPersistenceAdapterFactory 
+      useQuickJournal="false" journalLogFiles="2" dataDirectory="loadtest"/>
+    </persistenceFactory>
   
     <transportConnectors>
       <transportConnector uri="tcp://localhost:0"/>

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-queue.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-queue.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-queue.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-queue.xml Wed Mar  3 11:05:34 2010
@@ -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" />
 

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-topic.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-topic.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-topic.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-topic.xml Wed Mar  3 11:05:34 2010
@@ -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" />
 

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/filtered-queue.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/filtered-queue.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/filtered-queue.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/filtered-queue.xml Wed Mar  3 11:05:34 2010
@@ -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" />
 

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/global-virtual-topics.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/global-virtual-topics.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/global-virtual-topics.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/global-virtual-topics.xml Wed Mar  3 11:05:34 2010
@@ -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" />
 

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/bugs/amq1095/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/bugs/amq1095/activemq.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/bugs/amq1095/activemq.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/bugs/amq1095/activemq.xml Wed Mar  3 11:05:34 2010
@@ -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>
 

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/config.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/config.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/config.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/config.xml Wed Mar  3 11:05:34 2010
@@ -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>

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/example.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/example.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/example.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/example.xml Wed Mar  3 11:05:34 2010
@@ -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:memoryPersistenceAdapter init-method="createTransactionStore"/>
-        </amq:persistenceAdapter>
+        <amq:transportConnectors>
+            <amq:transportConnector uri="tcp://localhost:61635"/>
+            <amq:transportConnector uri="tcp://localhost:61636"/>
+            <amq:transportConnector uri="tcp://localhost:61637"/>
+        </amq:transportConnectors>
+
 
     </amq:broker>
 

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml Wed Mar  3 11:05:34 2010
@@ -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>
 
     <!-- ==================================================================== -->

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/journal-example.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/journal-example.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/journal-example.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/journal-example.xml Wed Mar  3 11:05:34 2010
@@ -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:transportConnectors>
-            <amq:transportConnector uri="tcp://localhost:61635"/>
-        </amq:transportConnectors>
+    <amq:broker brokerName="brokerJournalConfigTest" persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true">
 
         <amq:persistenceAdapter>
             <amq:journalPersistenceAdapter>
-                <constructor-arg index="0">
+                <amq:journal>
                     <ref bean="myJournalImpl"/>
-                </constructor-arg>
+                </amq:journal>
 
-                <constructor-arg index="1">
-                    <amq:memoryPersistenceAdapter init-method="createTransactionStore"/>
-                </constructor-arg>
+                <amq:persistenceAdapter>
+                    <amq:memoryPersistenceAdapter createTransactionStore="true"/>
+                </amq:persistenceAdapter>
 
-                <constructor-arg index="2">
+                <amq:taskRunnerFactory>
                     <bean id="myTaskRunnerFactory" class="org.apache.activemq.thread.TaskRunnerFactory"/>
-                </constructor-arg>
+                </amq:taskRunnerFactory>
             </amq:journalPersistenceAdapter>
         </amq:persistenceAdapter>
+
+        <amq:transportConnectors>
+            <amq:transportConnector uri="tcp://localhost:61635"/>
+        </amq:transportConnectors>
+
     </amq:broker>
 
     <!-- The journal implementation that will be used -->

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/journaledjdbc-example.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/journaledjdbc-example.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/journaledjdbc-example.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/journaledjdbc-example.xml Wed Mar  3 11:05:34 2010
@@ -16,16 +16,21 @@
     limitations under the License.
 -->
 
-<beans xmlns:amq="http://activemq.apache.org/schema/core">
-
-    <amq:broker brokerName="brokerJournaledJDBCConfigTest" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true">
+<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="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>

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/memory-example.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/memory-example.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/memory-example.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/memory-example.xml Wed Mar  3 11:05:34 2010
@@ -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>

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/memory/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/memory/activemq.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/memory/activemq.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/memory/activemq.xml Wed Mar  3 11:05:34 2010
@@ -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>
 

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/duplexLocalBroker.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/duplexLocalBroker.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/duplexLocalBroker.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/duplexLocalBroker.xml Wed Mar  3 11:05:34 2010
@@ -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)">
-         duplex=true
-         dynamicOnly = false
-         conduitSubscriptions = true
-         decreaseNetworkConsumerPriority = false
-      	<excludedDestinations>
-      		<queue physicalName="exclude.test.foo"/>
-      		<topic physicalName="exclude.test.bar"/>
-      	</excludedDestinations>
+      <networkConnector uri="static:(tcp://localhost:61617)"
+         duplex="true"
+         dynamicOnly = "false"
+         conduitSubscriptions = "true"
+         decreaseNetworkConsumerPriority = "false">
+
       	<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>
 

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/jms/queue-xbean.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/jms/queue-xbean.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/jms/queue-xbean.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/jms/queue-xbean.xml Wed Mar  3 11:05:34 2010
@@ -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>
\ No newline at end of file

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/localBroker.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/localBroker.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/localBroker.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/localBroker.xml Wed Mar  3 11:05:34 2010
@@ -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)">
-         dynamicOnly = false
-         conduitSubscriptions = true
-         decreaseNetworkConsumerPriority = false
-      	<excludedDestinations>
-      		<queue physicalName="exclude.test.foo"/>
-      		<topic physicalName="exclude.test.bar"/>
-      	</excludedDestinations>
+      <networkConnector uri="static:(tcp://localhost:61617)"
+         dynamicOnly = "false"
+         conduitSubscriptions = "true"
+         decreaseNetworkConsumerPriority = "false">
       	<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>
 

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker1.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker1.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker1.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker1.xml Wed Mar  3 11:05:34 2010
@@ -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>
   

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker2.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker2.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker2.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker2.xml Wed Mar  3 11:05:34 2010
@@ -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>
   

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml Wed Mar  3 11:05:34 2010
@@ -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>

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker1.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker1.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker1.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker1.xml Wed Mar  3 11:05:34 2010
@@ -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>
   

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker2.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker2.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker2.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker2.xml Wed Mar  3 11:05:34 2010
@@ -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>
   

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/security/broker1.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/security/broker1.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/security/broker1.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/security/broker1.xml Wed Mar  3 11:05:34 2010
@@ -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>

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/security/broker2.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/security/broker2.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/security/broker2.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/security/broker2.xml Wed Mar  3 11:05:34 2010
@@ -24,20 +24,7 @@
   
   <broker xmlns="http://activemq.apache.org/schema/core" brokerName="broker2" useJmx="false" persistent="false">
 
-    <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>
-
- <plugins>
+    <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>

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker.xml Wed Mar  3 11:05:34 2010
@@ -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">

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml Wed Mar  3 11:05:34 2010
@@ -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>

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-buffer.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-buffer.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-buffer.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-buffer.xml Wed Mar  3 11:05:34 2010
@@ -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">

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-destination-buffer.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-destination-buffer.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-destination-buffer.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-destination-buffer.xml Wed Mar  3 11:05:34 2010
@@ -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">

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-lastimage-policy.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-lastimage-policy.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-lastimage-policy.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-lastimage-policy.xml Wed Mar  3 11:05:34 2010
@@ -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"/>
 

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-message-query.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-message-query.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-message-query.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-message-query.xml Wed Mar  3 11:05:34 2010
@@ -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"/>
 

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-timed-policy.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-timed-policy.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-timed-policy.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-timed-policy.xml Wed Mar  3 11:05:34 2010
@@ -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"/>
 

Modified: activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/niostomp-auth-broker.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/niostomp-auth-broker.xml?rev=918405&r1=918404&r2=918405&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/niostomp-auth-broker.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/niostomp-auth-broker.xml Wed Mar  3 11:05:34 2010
@@ -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>



Mime
View raw message