activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r421897 - in /incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq: broker/ft/ broker/policy/ broker/store/ config/ network/ network/multicast/ perf/ security/ test/retroactive/ usecases/ xbean/
Date Fri, 14 Jul 2006 13:10:21 GMT
Author: jstrachan
Date: Fri Jul 14 06:10:19 2006
New Revision: 421897

URL: http://svn.apache.org/viewvc?rev=421897&view=rev
Log:
fixed namespaces in XML files to only apply the ActiveMQ namespace to the <broker> element
and its decendants to avoid confusing spring/xbean-spring when using other tags like <bean>.
Bad James - they should have been like this to start with :)

Modified:
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/master.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/policy/individual-dlq.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/store/kahabroker.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/store/loadtester.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/config/config.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/localBroker.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/multicast/localBroker.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/multicast/remoteBroker.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/perf/kahaBroker.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/perf/slowConsumerBroker.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-buffer.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-destination-buffer.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-message-query.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-timed-policy.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/activemq.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-http.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-http.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq-policy.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq2.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/connector-test.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-test.xml
    incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/management-context-test.xml

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/master.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/master.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/master.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/master.xml
Fri Jul 14 06:10:19 2006
@@ -14,10 +14,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-  <broker brokerName="master" persistent="false" useJmx="false" deleteAllMessagesOnStartup="true">
+  <broker brokerName="master" persistent="false" useJmx="false" deleteAllMessagesOnStartup="true"
 xmlns="http://activemq.org/config/1.0">
     <transportConnectors>
       <transportConnector uri="tcp://localhost:62001"/>
     </transportConnectors>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave.xml
Fri Jul 14 06:10:19 2006
@@ -14,10 +14,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans">
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-  <broker brokerName="slave" persistent="false" useJmx="false" masterConnectorURI="tcp://localhost:62001"
deleteAllMessagesOnStartup="true">
+  <broker brokerName="slave" persistent="false" useJmx="false" masterConnectorURI="tcp://localhost:62001"
deleteAllMessagesOnStartup="true"  xmlns="http://activemq.org/config/1.0>
     <transportConnectors>
       <transportConnector uri="tcp://localhost:62002"/>
     </transportConnectors>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/policy/individual-dlq.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/policy/individual-dlq.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/policy/individual-dlq.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/policy/individual-dlq.xml
Fri Jul 14 06:10:19 2006
@@ -17,10 +17,10 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-  <broker persistent="false">
+  <broker persistent="false" xmlns="http://activemq.org/config/1.0">
 
     <!--  lets define the dispatch policy -->
     <destinationPolicy>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/store/kahabroker.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/store/kahabroker.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/store/kahabroker.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/store/kahabroker.xml
Fri Jul 14 06:10:19 2006
@@ -14,10 +14,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-  <broker brokerName="broker" persistent="false" useJmx="false">
+  <broker brokerName="broker" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
      <transportConnectors>
       <transportConnector uri="tcp://localhost:0"/>
     </transportConnectors>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/store/loadtester.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/store/loadtester.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/store/loadtester.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/store/loadtester.xml
Fri Jul 14 06:10:19 2006
@@ -14,12 +14,12 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <usageManager id="memory-manager" limit="1048576"/> <!--  1 meg limit -->
   
-  <broker useJmx="true" deleteAllMessagesOnStartup="true" memoryManager="#memory-manager">
+  <broker useJmx="true" deleteAllMessagesOnStartup="true" memoryManager="#memory-manager"
 xmlns="http://activemq.org/config/1.0">
   
     <persistenceAdapter>
       <journaledJDBC 

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/config/config.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/config/config.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/config/config.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/config/config.xml
Fri Jul 14 06:10:19 2006
@@ -14,9 +14,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
 
-  <broker brokerName="brokerXmlConfigHelper" persistent="false" useShutdownHook="false"
deleteAllMessagesOnStartup="true">
+  <broker brokerName="brokerXmlConfigHelper" persistent="false" useShutdownHook="false"
deleteAllMessagesOnStartup="true" xmlns="http://activemq.org/config/1.0">
     <transportConnectors>
       <transportConnector uri="tcp://localhost:61638"/>
     </transportConnectors>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/localBroker.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/localBroker.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/localBroker.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/localBroker.xml
Fri Jul 14 06:10:19 2006
@@ -14,10 +14,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-<broker brokerName="localBroker" persistent="true" useShutdownHook="false">
+<broker brokerName="localBroker" persistent="true" useShutdownHook="false" xmlns="http://activemq.org/config/1.0">
     <transportConnectors>
       <transportConnector uri="tcp://localhost:61616"/>
     </transportConnectors>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/multicast/localBroker.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/multicast/localBroker.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/multicast/localBroker.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/multicast/localBroker.xml
Fri Jul 14 06:10:19 2006
@@ -14,9 +14,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
 
-  <broker brokerName="localBroker" persistent="false" useShutdownHook="false">
+  <broker brokerName="localBroker" persistent="false" useShutdownHook="false" xmlns="http://activemq.org/config/1.0">
     
     <transportConnectors><transportConnector uri="tcp://localhost:61616" /></transportConnectors>
 

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/multicast/remoteBroker.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/multicast/remoteBroker.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/multicast/remoteBroker.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/multicast/remoteBroker.xml
Fri Jul 14 06:10:19 2006
@@ -14,9 +14,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
 
-  <broker brokerName="remoteBroker" persistent="false" useShutdownHook="false">
+  <broker brokerName="remoteBroker" persistent="false" useShutdownHook="false" xmlns="http://activemq.org/config/1.0">
 
     <transportConnectors><transportConnector uri="tcp://localhost:61617" /></transportConnectors>
 

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml
Fri Jul 14 06:10:19 2006
@@ -14,10 +14,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-  <broker brokerName="remoteBroker" persistent="true" useShutdownHook="false">
+  <broker brokerName="remoteBroker" persistent="true" useShutdownHook="false" xmlns="http://activemq.org/config/1.0">
     <transportConnectors>
       <transportConnector uri="tcp://localhost:61617"/>
     </transportConnectors>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/perf/kahaBroker.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/perf/kahaBroker.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/perf/kahaBroker.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/perf/kahaBroker.xml
Fri Jul 14 06:10:19 2006
@@ -14,10 +14,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans >
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-  <broker brokerName="broker" persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true">
+  <broker brokerName="broker" persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true"
xmlns="http://activemq.org/config/1.0">
     <transportConnectors>
       <transportConnector uri="tcp://localhost:61616"/>
     </transportConnectors>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/perf/slowConsumerBroker.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/perf/slowConsumerBroker.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/perf/slowConsumerBroker.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/perf/slowConsumerBroker.xml
Fri Jul 14 06:10:19 2006
@@ -14,10 +14,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-  <broker brokerName="slowConsumerBroker" persistent="true" useShutdownHook="false">
+  <broker brokerName="slowConsumerBroker" persistent="true" useShutdownHook="false" xmlns="http://activemq.org/config/1.0">
     <transportConnectors>
       <transportConnector uri="tcp://localhost:61616"/>
     </transportConnectors>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker.xml
Fri Jul 14 06:10:19 2006
@@ -17,10 +17,10 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: example -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-  <broker useJmx="false" persistent="false">
+  <broker useJmx="false" persistent="false" xmlns="http://activemq.org/config/1.0">
 
     <plugins>
       <!--  use JAAS to authenticate using the login.config file on the classpath to configure
JAAS -->

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-buffer.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-buffer.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-buffer.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-buffer.xml
Fri Jul 14 06:10:19 2006
@@ -17,10 +17,10 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-  <broker persistent="false">
+  <broker persistent="false" xmlns="http://activemq.org/config/1.0">
 
     <destinationPolicy>
       <policyMap>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-destination-buffer.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-destination-buffer.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-destination-buffer.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-destination-buffer.xml
Fri Jul 14 06:10:19 2006
@@ -17,10 +17,10 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-  <broker persistent="false">
+  <broker persistent="false" xmlns="http://activemq.org/config/1.0">
 
     <destinationPolicy>
       <policyMap>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-message-query.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-message-query.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-message-query.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-message-query.xml
Fri Jul 14 06:10:19 2006
@@ -17,11 +17,11 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans xmlns="http://activemq.org/config/1.0"
-  xmlns:s="http://xbean.org/spring/">
+<beans xmlns:s="http://xbean.org/spring/">
+
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-  <broker persistent="false">
+  <broker persistent="false" xmlns="http://activemq.org/config/1.0">
 
     <destinationPolicy>
       <policyMap>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-timed-policy.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-timed-policy.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-timed-policy.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-timed-policy.xml
Fri Jul 14 06:10:19 2006
@@ -17,10 +17,11 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
+
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-  <broker persistent="false">
+  <broker persistent="false" xmlns="http://activemq.org/config/1.0">
 
     <destinationPolicy>
       <policyMap>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/activemq.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/activemq.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/activemq.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/activemq.xml
Fri Jul 14 06:10:19 2006
@@ -14,9 +14,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
   
-  <broker useJmx="true">
+  <broker useJmx="true" xmlns="http://activemq.org/config/1.0">
 
 	<!-- In ActiveMQ 4, you can setup destination policies -->  
     <destinationPolicy>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml
Fri Jul 14 06:10:19 2006
@@ -14,9 +14,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
 
-  <broker brokerName="BrokerA" persistent="false" useJmx="false">
+  <broker brokerName="BrokerA" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
     <transportConnectors>
       <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
     </transportConnectors>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml
Fri Jul 14 06:10:19 2006
@@ -14,9 +14,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
 
-  <broker brokerName="BrokerB" persistent="false" useJmx="false">
+  <broker brokerName="BrokerB" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
     <transportConnectors>
       <transportConnector uri="tcp://localhost:61617" discoveryUri="multicast://default"/>
     </transportConnectors>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml
Fri Jul 14 06:10:19 2006
@@ -14,9 +14,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
 
-  <broker brokerName="BrokerB" persistent="false" useJmx="false">
+  <broker brokerName="BrokerB" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
     <transportConnectors>
       <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default"/>
     </transportConnectors>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml
Fri Jul 14 06:10:19 2006
@@ -14,10 +14,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
 
 
-  <broker brokerName="receiver" persistent="false" useJmx="false">
+  <broker brokerName="receiver" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
     <transportConnectors>
       <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default"/>
     </transportConnectors>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-http.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-http.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-http.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-http.xml
Fri Jul 14 06:10:19 2006
@@ -14,9 +14,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
 
-  <broker brokerName="receiver" persistent="false">
+  <broker brokerName="receiver" persistent="false" xmlns="http://activemq.org/config/1.0">
     <transportConnectors>
       <transportConnector uri="http://localhost:62302"/>
     </transportConnectors>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver.xml
Fri Jul 14 06:10:19 2006
@@ -14,9 +14,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
 
-  <broker brokerName="receiver" persistent="false" useJmx="false">
+  <broker brokerName="receiver" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
     <transportConnectors>
       <transportConnector uri="tcp://localhost:62002"/>
     </transportConnectors>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml
Fri Jul 14 06:10:19 2006
@@ -14,9 +14,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
 
-  <broker brokerName="sender" persistent="false" useJmx="false">
+  <broker brokerName="sender" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
     <transportConnectors>
       <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default"/>
     </transportConnectors>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-http.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-http.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-http.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-http.xml
Fri Jul 14 06:10:19 2006
@@ -14,9 +14,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
 
-  <broker brokerName="sender" persistent="false">
+  <broker brokerName="sender" persistent="false" xmlns="http://activemq.org/config/1.0">
     <transportConnectors>
       <transportConnector uri="http://localhost:62301"/>
     </transportConnectors>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender.xml
Fri Jul 14 06:10:19 2006
@@ -14,9 +14,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
 
-  <broker brokerName="sender" persistent="false" useJmx="false">
+  <broker brokerName="sender" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
     <transportConnectors>
       <transportConnector uri="tcp://localhost:62001"/>
     </transportConnectors>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq-policy.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq-policy.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq-policy.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq-policy.xml
Fri Jul 14 06:10:19 2006
@@ -17,11 +17,11 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-  <broker persistent="false" brokerName="${brokername}">
+  <broker persistent="false" brokerName="${brokername}" xmlns="http://activemq.org/config/1.0">
 
     <!--  lets define the dispatch policy -->
     <destinationPolicy>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq2.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq2.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq2.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq2.xml
Fri Jul 14 06:10:19 2006
@@ -15,12 +15,12 @@
     limitations under the License.
 -->
 
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <!-- for easier integration with the JUnit tests, lets not start the broker when the
ApplicationContext starts -->
-  <broker useJmx="true" start="false">
+  <broker useJmx="true" start="false" xmlns="http://activemq.org/config/1.0">
     <destinationPolicy>
       <policyMap>
         <policyEntries>

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/connector-test.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/connector-test.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/connector-test.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/connector-test.xml
Fri Jul 14 06:10:19 2006
@@ -17,11 +17,11 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-  <broker useJmx="true">
+  <broker useJmx="true" xmlns="http://activemq.org/config/1.0">
 
     <transportConnectors>
       <transportConnector uri="tcp://localhost:61636" />

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-test.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-test.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-test.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-test.xml
Fri Jul 14 06:10:19 2006
@@ -17,10 +17,10 @@
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-  <broker useJmx="false">
+  <broker useJmx="false" xmlns="http://activemq.org/config/1.0">
 
     <persistenceAdapter>
       <journaledJDBC useJournal="false">

Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/management-context-test.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/management-context-test.xml?rev=421897&r1=421896&r2=421897&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/management-context-test.xml
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/management-context-test.xml
Fri Jul 14 06:10:19 2006
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2005-2006 The Apache Software Foundation
-   
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-   
-    http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  Copyright 2005-2006 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <!-- this file can only be parsed using the xbean-spring library -->
 <!-- START SNIPPET: xbean -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans>
 
-  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
/>
 
-  <broker useJmx="true">
-	<managementContext>
-	   <managementContext connectorPort="2011" jmxDomainName="test.domain"/>
-	</managementContext>
+  <broker useJmx="true" xmlns="http://activemq.org/config/1.0">
+    <managementContext>
+      <managementContext connectorPort="2011" jmxDomainName="test.domain" />
+    </managementContext>
   </broker>
 
 </beans>



Mime
View raw message