AMQ-1673: Namespace updated.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@649568 13f79535-47bb-0310-9956-ffa450edef68
2008-04-18 15:18:19 +00:00 · 2008-04-18 15:18:19 +00:00 · c275d4c3ac
parent ce9255979b
commit c275d4c3ac
95 changed files with 110 additions and 110 deletions
--- a/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/LoadTest-context.xml
+++ b/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/LoadTest-context.xml
@ -21,7 +21,7 @@
       xsi:schemaLocation="
       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
       http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
-       http://activemq.org/config/1.0 http://activemq.apache.org/schema/core/activemq-core-5.0.0.xsd
+       http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.0.0.xsd
    ">

  <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
@ -44,7 +44,7 @@
  </bean>

  <!-- lets create an embedded broker for this test -->
-  <broker xmlns="http://activemq.org/config/1.0" dataDirectory="target/activemq">
+  <broker xmlns="http://activemq.apache.org/schema/core" dataDirectory="target/activemq">

    <transportConnectors>
       <transportConnector uri="tcp://localhost:61616"/>
--- a/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerLoadTest-context.xml
+++ b/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerLoadTest-context.xml
@ -21,7 +21,7 @@
       xsi:schemaLocation="
       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
       http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
-       http://activemq.org/config/1.0 http://activemq.apache.org/schema/core/activemq-core-5.0.0.xsd
+       http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.0.0.xsd
    ">

  <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
--- a/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerParallelProducerLoadTest-context.xml
+++ b/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerParallelProducerLoadTest-context.xml
@ -21,7 +21,7 @@
       xsi:schemaLocation="
       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
       http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
-       http://activemq.org/config/1.0 http://activemq.apache.org/schema/core/activemq-core-5.0.0.xsd
+       http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.0.0.xsd
    ">

  <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
--- a/activemq-console/src/test/resources/activemq.xml
+++ b/activemq-console/src/test/resources/activemq.xml
@ -21,7 +21,7 @@
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
  
  <!-- Default configuration -->
-  <broker useJmx="false" xmlns="http://activemq.org/config/1.0">
+  <broker useJmx="false" xmlns="http://activemq.apache.org/schema/core">
 	  
 	<transportConnectors>
      <transportConnector uri="tcp://localhost:61616"/>
@ -34,7 +34,7 @@
  </broker>

  <!-- Example of broker configuration that uses new logging options and dynamic management of logging
-  <broker useJmx="true" xmlns="http://activemq.org/config/1.0" persistent="false" deleteAllMessagesOnStartup="true">
+  <broker useJmx="true" xmlns="http://activemq.apache.org/schema/core" persistent="false" deleteAllMessagesOnStartup="true">
  
    <transportConnectors>
      <transportConnector uri="tcp://localhost:61616?trace=true&amp;logWriterName=custom&amp;dynamicManagement=true&amp;startLogging=true"/>
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@ -562,7 +562,7 @@
        <executions>
          <execution>
            <configuration>
-              <namespace>http://activemq.org/config/1.0</namespace>
+              <namespace>http://activemq.apache.org/schema/core</namespace>
              <schema>target/xbean/activemq.xsd</schema>
              <generateSpringSchemasFile>false</generateSpringSchemasFile>
            </configuration>
--- a/activemq-core/src/main/resources/activemq.xsd
+++ b/activemq-core/src/main/resources/activemq.xsd
@ -2,9 +2,9 @@
 <!-- NOTE: this file is autogenerated by Apache XBean -->

 <xs:schema elementFormDefault='qualified'
-           targetNamespace='http://activemq.org/config/1.0'
+           targetNamespace='http://activemq.apache.org/schema/core'
           xmlns:xs='http://www.w3.org/2001/XMLSchema'
-           xmlns:tns='http://activemq.org/config/1.0'>
+           xmlns:tns='http://activemq.apache.org/schema/core'>

  <!-- element for type: org.apache.activemq.store.amq.AMQPersistenceAdapter -->
  <xs:element name='amqPersistenceAdapter'>
--- a/activemq-core/src/main/resources/activemq.xsd.html
+++ b/activemq-core/src/main/resources/activemq.xsd.html
@ -1,7 +1,7 @@
 <!-- NOTE: this file is autogenerated by Apache XBean -->
 <html>
 <head>
-<title>Schema for namespace: http://activemq.org/config/1.0</title>
+<title>Schema for namespace: http://activemq.apache.org/schema/core</title>
 <link rel='stylesheet' href='style.css' type='text/css'>
 <link rel='stylesheet' href='http://activemq.org/style.css' type='text/css'>
 <link rel='stylesheet' href='http://activemq.org/style-xb.css' type='text/css'>
--- a/activemq-core/src/test/resources/activemq.xml
+++ b/activemq-core/src/test/resources/activemq.xml
@ -19,7 +19,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker useJmx="false"  xmlns="http://activemq.org/config/1.0" persistent="false">
+  <broker useJmx="false"  xmlns="http://activemq.apache.org/schema/core" persistent="false">
  
    <transportConnectors>
      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default"/>
--- a/activemq-core/src/test/resources/org/apache/activemq/broker/destinations-on-start.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/broker/destinations-on-start.xml
@ -22,7 +22,7 @@

  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />

-  <broker xmlns="http://activemq.org/config/1.0">
+  <broker xmlns="http://activemq.apache.org/schema/core">
    <destinations>
      <queue physicalName="FOO.BAR" />
      <topic physicalName="SOME.TOPIC" />
--- a/activemq-core/src/test/resources/org/apache/activemq/broker/ft/master.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/broker/ft/master.xml
@ -18,7 +18,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker brokerName="master" persistent="false" useJmx="false" deleteAllMessagesOnStartup="true"  xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="master" persistent="false" useJmx="false" deleteAllMessagesOnStartup="true"  xmlns="http://activemq.apache.org/schema/core">
    <transportConnectors>
      <transportConnector uri="tcp://localhost:62001"/>
    </transportConnectors>
--- a/activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileMaster.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileMaster.xml
@ -18,7 +18,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker brokerName="shared"  useJmx="false" deleteAllMessagesOnStartup="true"  xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="shared"  useJmx="false" deleteAllMessagesOnStartup="true"  xmlns="http://activemq.apache.org/schema/core">
    <transportConnectors>
      <transportConnector uri="tcp://localhost:62001"/>
    </transportConnectors>
--- a/activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileSlave.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileSlave.xml
@ -18,7 +18,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker brokerName="shared" useJmx="false"  deleteAllMessagesOnStartup="true"  xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="shared" useJmx="false"  deleteAllMessagesOnStartup="true"  xmlns="http://activemq.apache.org/schema/core">
    <transportConnectors>
      <transportConnector uri="tcp://localhost:62002"/>
    </transportConnectors>
--- a/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave.xml
@ -18,7 +18,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker brokerName="slave" useJmx="false" masterConnectorURI="tcp://localhost:62001"  xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="slave" useJmx="false" masterConnectorURI="tcp://localhost:62001"  xmlns="http://activemq.apache.org/schema/core">
    <transportConnectors>
      <transportConnector uri="tcp://localhost:62002"/>
    </transportConnectors>
--- a/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave2.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave2.xml
@ -19,7 +19,7 @@
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

  <!-- START SNIPPET: example -->
-  <broker brokerName="slave" useJmx="false"  deleteAllMessagesOnStartup="true"  xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="slave" useJmx="false"  deleteAllMessagesOnStartup="true"  xmlns="http://activemq.apache.org/schema/core">
  
    <transportConnectors>
      <transportConnector uri="tcp://localhost:62002"/>
--- a/activemq-core/src/test/resources/org/apache/activemq/broker/policy/cursor.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/broker/policy/cursor.xml
@ -20,7 +20,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker persistent="false" xmlns="http://activemq.org/config/1.0">
+  <broker persistent="false" xmlns="http://activemq.apache.org/schema/core">

    <!--  lets define the dispatch policy -->
    <destinationPolicy>
--- a/activemq-core/src/test/resources/org/apache/activemq/broker/policy/individual-dlq.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/broker/policy/individual-dlq.xml
@ -21,7 +21,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker persistent="false" xmlns="http://activemq.org/config/1.0">
+  <broker persistent="false" xmlns="http://activemq.apache.org/schema/core">

    <!--  lets define the dispatch policy -->
    <destinationPolicy>
--- a/activemq-core/src/test/resources/org/apache/activemq/broker/store/kahabroker.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/broker/store/kahabroker.xml
@ -18,7 +18,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker brokerName="broker" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="broker" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
     <transportConnectors>
      <transportConnector uri="tcp://localhost:0"/>
    </transportConnectors>
--- a/activemq-core/src/test/resources/org/apache/activemq/broker/store/loadtester.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/broker/store/loadtester.xml
@ -20,7 +20,7 @@

  <usageManager id="memory-manager" limit="1048576"/> <!--  1 meg limit -->
  
-  <broker useJmx="true" deleteAllMessagesOnStartup="true" memoryManager="#memory-manager"  xmlns="http://activemq.org/config/1.0">
+  <broker useJmx="true" deleteAllMessagesOnStartup="true" memoryManager="#memory-manager"  xmlns="http://activemq.apache.org/schema/core">
  
    <persistenceAdapter>
      <journaledJDBC 
--- a/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-queue.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-queue.xml
@ -22,7 +22,7 @@

  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />

-  <broker persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+  <broker persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
    <destinationInterceptors>
      <virtualDestinationInterceptor>
        <virtualDestinations>
--- a/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-topic.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/composite-topic.xml
@ -22,7 +22,7 @@

  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />

-  <broker xmlns="http://activemq.org/config/1.0">
+  <broker xmlns="http://activemq.apache.org/schema/core">
    <destinationInterceptors>
      <virtualDestinationInterceptor>
        <virtualDestinations>
--- a/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/filtered-queue.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/filtered-queue.xml
@ -22,7 +22,7 @@

  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />

-  <broker xmlns="http://activemq.org/config/1.0">
+  <broker xmlns="http://activemq.apache.org/schema/core">
    <destinationInterceptors>
      <virtualDestinationInterceptor>
        <virtualDestinations>
--- a/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/global-virtual-topics.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/broker/virtual/global-virtual-topics.xml
@ -22,7 +22,7 @@

  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />

-  <broker xmlns="http://activemq.org/config/1.0">
+  <broker xmlns="http://activemq.apache.org/schema/core">
    <destinationInterceptors>
      <virtualDestinationInterceptor>
        <virtualDestinations>
--- a/activemq-core/src/test/resources/org/apache/activemq/bugs/amq1095/activemq.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/bugs/amq1095/activemq.xml
@ -17,7 +17,7 @@
 -->
 <beans>

-  <broker brokerName="localhost" xmlns="http://activemq.org/config/1.0" persistent="true">
+  <broker brokerName="localhost" xmlns="http://activemq.apache.org/schema/core" persistent="true">
  
    <persistenceAdapter>
      <kahaPersistenceAdapter directory="file:kahadir" maxDataFileLength="200000"/>
--- a/activemq-core/src/test/resources/org/apache/activemq/config/config.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/config/config.xml
@ -17,7 +17,7 @@
 -->
 <beans>

-  <broker brokerName="brokerXmlConfigHelper" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="brokerXmlConfigHelper" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true" xmlns="http://activemq.apache.org/schema/core">
    <transportConnectors>
      <transportConnector uri="tcp://localhost:61638"/>
    </transportConnectors>
--- a/activemq-core/src/test/resources/org/apache/activemq/config/example.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/config/example.xml
@ -15,7 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<beans xmlns:amq="http://activemq.org/config/1.0">
+<beans xmlns:amq="http://activemq.apache.org/schema/core">

    <!-- normal ActiveMQ XML config which is less verbose & can be validated -->
    <amq:broker brokerName="brokerConfigTest" populateJMSXUserID="false"
--- a/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml
@ -15,7 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<beans xmlns:amq="http://activemq.org/config/1.0">
+<beans xmlns:amq="http://activemq.apache.org/schema/core">

    <amq:broker brokerName="brokerJdbcConfigTest" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true">

--- a/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/journal-example.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/journal-example.xml
@ -15,7 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<beans xmlns:amq="http://activemq.org/config/1.0">
+<beans xmlns:amq="http://activemq.apache.org/schema/core">

    <amq:broker brokerName="brokerJournalConfigTest" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true">

--- a/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/journaledjdbc-example.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/journaledjdbc-example.xml
@ -16,7 +16,7 @@
    limitations under the License.
 -->

-<beans xmlns:amq="http://activemq.org/config/1.0">
+<beans xmlns:amq="http://activemq.apache.org/schema/core">

    <amq:broker brokerName="brokerJournaledJDBCConfigTest" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true">

--- a/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/memory-example.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/memory-example.xml
@ -16,7 +16,7 @@
    limitations under the License.
 -->

-<beans xmlns:amq="http://activemq.org/config/1.0">
+<beans xmlns:amq="http://activemq.apache.org/schema/core">

    <amq:broker brokerName="brokerMemoryConfigTest" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true">

--- a/activemq-core/src/test/resources/org/apache/activemq/memory/activemq.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/memory/activemq.xml
@ -17,10 +17,10 @@
 <!-- START SNIPPET: example -->
 <beans
  xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.org/config/1.0"
+  xmlns:amq="http://activemq.apache.org/schema/core"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.org/config/1.0 http://activemq.apache.org/schema/activemq-core.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/activemq-core.xsd
  http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">

  <!-- Allows us to use system properties as variables in this configuration file -->
@ -28,7 +28,7 @@
 	<property name="location" value="org/apache/activemq/memory/usage.properties"/> 
  </bean>  

-  <broker xmlns="http://activemq.org/config/1.0" brokerName="${name}" persistent="false">
+  <broker xmlns="http://activemq.apache.org/schema/core" brokerName="${name}" persistent="false">
   
    <!-- Use the following to set the broker memory limit -->
 	<systemUsage>
--- a/activemq-core/src/test/resources/org/apache/activemq/network/duplexLocalBroker.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/network/duplexLocalBroker.xml
@ -18,7 +18,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-<broker brokerName="localBroker" persistent="true" useShutdownHook="false" xmlns="http://activemq.org/config/1.0">
+<broker brokerName="localBroker" persistent="true" useShutdownHook="false" xmlns="http://activemq.apache.org/schema/core">
    <transportConnectors>
      <transportConnector uri="tcp://localhost:61616"/>
    </transportConnectors>
--- a/activemq-core/src/test/resources/org/apache/activemq/network/jms/queue-xbean.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/network/jms/queue-xbean.xml
@ -21,7 +21,7 @@

  <!-- remote broker -->

-  <broker xmlns="http://activemq.org/config/1.0" id="remotebroker"
+  <broker xmlns="http://activemq.apache.org/schema/core" id="remotebroker"
    brokerName="remotebroker" persistent="false">
    <transportConnectors>
      <transportConnector uri="tcp://localhost:61666" />
@ -31,7 +31,7 @@
  <!-- local broker with embedded Jms to Jms bridge (ok - it's contrived) -->
  
  <!-- START SNIPPET: example -->
-  <broker xmlns="http://activemq.org/config/1.0" id="localbroker"
+  <broker xmlns="http://activemq.apache.org/schema/core" id="localbroker"
    brokerName="localBroker" persistent="false">
    <transportConnectors>
      <transportConnector uri="tcp://localhost:61234" />
--- a/activemq-core/src/test/resources/org/apache/activemq/network/localBroker.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/network/localBroker.xml
@ -18,7 +18,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-<broker brokerName="localBroker" persistent="true" useShutdownHook="false" monitorConnectionSplits="true" xmlns="http://activemq.org/config/1.0">
+<broker brokerName="localBroker" persistent="true" useShutdownHook="false" monitorConnectionSplits="true" xmlns="http://activemq.apache.org/schema/core">
    <transportConnectors>
      <transportConnector uri="tcp://localhost:61616"/>
    </transportConnectors>
--- a/activemq-core/src/test/resources/org/apache/activemq/network/multicast/localBroker.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/network/multicast/localBroker.xml
@ -17,7 +17,7 @@
 -->
 <beans>

-  <broker brokerName="localBroker" persistent="false" useShutdownHook="false" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="localBroker" persistent="false" useShutdownHook="false" xmlns="http://activemq.apache.org/schema/core">
    
    <transportConnectors><transportConnector uri="tcp://localhost:61616" /></transportConnectors>

--- a/activemq-core/src/test/resources/org/apache/activemq/network/multicast/remoteBroker.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/network/multicast/remoteBroker.xml
@ -17,7 +17,7 @@
 -->
 <beans>

-  <broker brokerName="remoteBroker" persistent="false" useShutdownHook="false" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="remoteBroker" persistent="false" useShutdownHook="false" xmlns="http://activemq.apache.org/schema/core">

    <transportConnectors><transportConnector uri="tcp://localhost:61617" /></transportConnectors>

--- a/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker1.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker1.xml
@ -18,7 +18,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker brokerName="broker1" persistent="false" useShutdownHook="false" useJmx="false"  xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="broker1" persistent="false" useShutdownHook="false" useJmx="false"  xmlns="http://activemq.apache.org/schema/core">

    <!-- disabling the subscription recovery policy allows us take memory leaks easier -->
    <destinationPolicy>
--- a/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker2.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker2.xml
@ -18,7 +18,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker brokerName="broker2" persistent="false" useShutdownHook="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="broker2" persistent="false" useShutdownHook="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">

    <!-- disabling the subscription recovery policy allows us take memory leaks easier -->
    <destinationPolicy>
--- a/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml
@ -18,7 +18,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker brokerName="remoteBroker" persistent="true" useShutdownHook="false" monitorConnectionSplits="true" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="remoteBroker" persistent="true" useShutdownHook="false" monitorConnectionSplits="true" xmlns="http://activemq.apache.org/schema/core">
    <transportConnectors>
      <transportConnector uri="tcp://localhost:61617"/>
    </transportConnectors>
--- a/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker1.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker1.xml
@ -18,7 +18,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker brokerName="broker1" persistent="false" useShutdownHook="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="broker1" persistent="false" useShutdownHook="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">

    <!-- disabling the subscription recovery policy allows us take memory leaks easier -->
    <destinationPolicy>
--- a/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker2.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker2.xml
@ -18,7 +18,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker brokerName="broker2" persistent="false" useShutdownHook="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="broker2" persistent="false" useShutdownHook="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">

    <!-- disabling the subscription recovery policy allows us take memory leaks easier -->
    <destinationPolicy>
--- a/activemq-core/src/test/resources/org/apache/activemq/perf/kahaBroker.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/perf/kahaBroker.xml
@ -18,7 +18,7 @@
 <beans >
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker brokerName="broker" persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="broker" persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true" xmlns="http://activemq.apache.org/schema/core">
    <transportConnectors>
      <transportConnector uri="tcp://localhost:61616"/>
    </transportConnectors>
--- a/activemq-core/src/test/resources/org/apache/activemq/perf/slowConsumerBroker.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/perf/slowConsumerBroker.xml
@ -18,7 +18,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker brokerName="slowConsumerBroker" useJmx="false" persistent="false" useShutdownHook="false" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="slowConsumerBroker" useJmx="false" persistent="false" useShutdownHook="false" xmlns="http://activemq.apache.org/schema/core">
    <transportConnectors>
      <transportConnector uri="tcp://localhost:61616"/>
    </transportConnectors>
--- a/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/security/jaas-broker.xml
@ -21,7 +21,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker useJmx="false" persistent="false" xmlns="http://activemq.org/config/1.0" populateJMSXUserID="true">
+  <broker useJmx="false" persistent="false" xmlns="http://activemq.apache.org/schema/core" populateJMSXUserID="true">

    <plugins>
      <!--  use JAAS to authenticate using the login.config file on the classpath to configure JAAS -->
--- a/activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml
@ -21,7 +21,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker useJmx="false" persistent="false" xmlns="http://activemq.org/config/1.0" populateJMSXUserID="true">
+  <broker useJmx="false" persistent="false" xmlns="http://activemq.apache.org/schema/core" populateJMSXUserID="true">

    <plugins>
 		<simpleAuthenticationPlugin>
--- a/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-buffer.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-buffer.xml
@ -21,7 +21,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker persistent="false" xmlns="http://activemq.org/config/1.0">
+  <broker persistent="false" xmlns="http://activemq.apache.org/schema/core">

    <destinationPolicy>
      <policyMap>
--- a/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-destination-buffer.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-fixed-destination-buffer.xml
@ -21,7 +21,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker persistent="false" xmlns="http://activemq.org/config/1.0">
+  <broker persistent="false" xmlns="http://activemq.apache.org/schema/core">

    <destinationPolicy>
      <policyMap>
--- a/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-lastimage-policy.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-lastimage-policy.xml
@ -22,7 +22,7 @@

  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker persistent="false" xmlns="http://activemq.org/config/1.0">
+  <broker persistent="false" xmlns="http://activemq.apache.org/schema/core">

    <destinationPolicy>
      <policyMap>
--- a/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-message-query.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-message-query.xml
@ -22,7 +22,7 @@

  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker persistent="false" xmlns="http://activemq.org/config/1.0">
+  <broker persistent="false" xmlns="http://activemq.apache.org/schema/core">

    <destinationPolicy>
      <policyMap>
--- a/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-timed-policy.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/test/retroactive/activemq-timed-policy.xml
@ -22,7 +22,7 @@

  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker persistent="false" xmlns="http://activemq.org/config/1.0">
+  <broker persistent="false" xmlns="http://activemq.apache.org/schema/core">

    <destinationPolicy>
      <policyMap>
--- a/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/stomp-auth-broker.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/stomp-auth-broker.xml
@ -25,7 +25,7 @@
  		<property name="annotatedClass"><value>org.apache.activemq.transport.stomp.SamplePojo</value></property>
  </bean>

-  <broker useJmx="false" persistent="false" xmlns="http://activemq.org/config/1.0" populateJMSXUserID="true">
+  <broker useJmx="false" persistent="false" xmlns="http://activemq.apache.org/schema/core" populateJMSXUserID="true">

 	<transportConnectors>
 		<transportConnector name="stomp"   uri="stomp://localhost:61613"/>
--- a/activemq-core/src/test/resources/org/apache/activemq/usecases/activemq.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/usecases/activemq.xml
@ -17,7 +17,7 @@
 -->
 <beans>
  
-  <broker useJmx="true" xmlns="http://activemq.org/config/1.0">
+  <broker useJmx="true" xmlns="http://activemq.apache.org/schema/core">

 	<!-- In ActiveMQ 4, you can setup destination policies -->  
    <destinationPolicy>
--- a/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml
@ -17,7 +17,7 @@
 -->
 <beans>

-  <broker brokerName="BrokerA" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="BrokerA" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
    <transportConnectors>
      <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
    </transportConnectors>
--- a/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml
@ -17,7 +17,7 @@
 -->
 <beans>

-  <broker brokerName="BrokerB" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="BrokerB" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
    <transportConnectors>
      <transportConnector uri="tcp://localhost:61617" discoveryUri="multicast://default"/>
    </transportConnectors>
--- a/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml
@ -17,7 +17,7 @@
 -->
 <beans>

-  <broker brokerName="BrokerB" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="BrokerB" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
    <transportConnectors>
      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default"/>
    </transportConnectors>
--- a/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml
@ -18,7 +18,7 @@
 <beans>


-  <broker brokerName="receiver" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="receiver" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
    <transportConnectors>
      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default"/>
    </transportConnectors>
--- a/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-http.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-http.xml
@ -17,7 +17,7 @@
 -->
 <beans>

-  <broker brokerName="receiver" persistent="false" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="receiver" persistent="false" xmlns="http://activemq.apache.org/schema/core">
    <transportConnectors>
      <transportConnector uri="http://localhost:62302"/>
    </transportConnectors>
--- a/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver.xml
@ -17,7 +17,7 @@
 -->
 <beans>

-  <broker brokerName="receiver" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="receiver" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
    <transportConnectors>
      <transportConnector uri="tcp://localhost:62002"/>
    </transportConnectors>
--- a/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml
@ -17,7 +17,7 @@
 -->
 <beans>

-  <broker brokerName="sender" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="sender" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
    <transportConnectors>
      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default"/>
    </transportConnectors>
--- a/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-http.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-http.xml
@ -17,7 +17,7 @@
 -->
 <beans>

-  <broker brokerName="sender" persistent="false" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="sender" persistent="false" xmlns="http://activemq.apache.org/schema/core">
    <transportConnectors>
      <transportConnector uri="http://localhost:62301"/>
    </transportConnectors>
--- a/activemq-core/src/test/resources/org/apache/activemq/usecases/sender.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/usecases/sender.xml
@ -17,7 +17,7 @@
 -->
 <beans>

-  <broker brokerName="sender" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="sender" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
    <transportConnectors>
      <transportConnector uri="tcp://localhost:62001"/>
    </transportConnectors>
--- a/activemq-core/src/test/resources/org/apache/activemq/util/logging-broker.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/util/logging-broker.xml
@ -21,7 +21,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker useJmx="false" persistent="false" xmlns="http://activemq.org/config/1.0">
+  <broker useJmx="false" persistent="false" xmlns="http://activemq.apache.org/schema/core">

    <plugins>
    
--- a/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq-policy.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq-policy.xml
@ -22,7 +22,7 @@

  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker persistent="false" brokerName="${brokername}" xmlns="http://activemq.org/config/1.0">
+  <broker persistent="false" brokerName="${brokername}" xmlns="http://activemq.apache.org/schema/core">

    <!--  lets define the dispatch policy -->
    <destinationPolicy>
--- a/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq.xml
@ -22,7 +22,7 @@

  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker useJmx="true" xmlns="http://activemq.org/config/1.0">
+  <broker useJmx="true" xmlns="http://activemq.apache.org/schema/core">

    <persistenceAdapter>
      <journaledJDBC journalLogFiles="5" dataDirectory="${basedir}/target/foo" />
--- a/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq2.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq2.xml
@ -21,7 +21,7 @@
  <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" xmlns="http://activemq.org/config/1.0">
+  <broker useJmx="true" start="false" xmlns="http://activemq.apache.org/schema/core">
    <destinationPolicy>
      <policyMap>
        <policyEntries>
--- a/activemq-core/src/test/resources/org/apache/activemq/xbean/connector-test.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/xbean/connector-test.xml
@ -22,7 +22,7 @@

  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker useJmx="true" xmlns="http://activemq.org/config/1.0">
+  <broker useJmx="true" xmlns="http://activemq.apache.org/schema/core">

    <transportConnectors>
      <transportConnector uri="tcp://localhost:61636" />
--- a/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-test.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-test.xml
@ -21,7 +21,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker useJmx="false" xmlns="http://activemq.org/config/1.0">
+  <broker useJmx="false" xmlns="http://activemq.apache.org/schema/core">

    <persistenceAdapter>
      <journaledJDBC useJournal="false">
--- a/activemq-core/src/test/resources/org/apache/activemq/xbean/management-context-test.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/xbean/management-context-test.xml
@ -22,7 +22,7 @@

  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />

-  <broker useJmx="true" xmlns="http://activemq.org/config/1.0">
+  <broker useJmx="true" xmlns="http://activemq.apache.org/schema/core">
    <managementContext>
      <managementContext connectorPort="2011" jmxDomainName="test.domain" />
    </managementContext>
--- a/activemq-core/src/test/resources/spring-embedded-xbean-local.xml
+++ b/activemq-core/src/test/resources/spring-embedded-xbean-local.xml
@ -19,10 +19,10 @@
 <!-- START SNIPPET: spring -->
 <beans 
  xmlns="http://www.springframework.org/schema/beans" 
-  xmlns:amq="http://activemq.org/config/1.0"
+  xmlns:amq="http://activemq.apache.org/schema/core"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd 
-  http://activemq.org/config/1.0 file:./target/xbean/activemq.xsd">
+  http://activemq.apache.org/schema/core file:./target/xbean/activemq.xsd">
  
  <!--  lets create an embedded ActiveMQ Broker -->
  <amq:broker useJmx="false" persistent="false">
--- a/activemq-core/src/test/resources/spring-embedded-xbean-noversion.xml
+++ b/activemq-core/src/test/resources/spring-embedded-xbean-noversion.xml
@ -19,10 +19,10 @@
 <!-- START SNIPPET: spring -->
 <beans 
  xmlns="http://www.springframework.org/schema/beans" 
-  xmlns:amq="http://activemq.org/config/1.0"
+  xmlns:amq="http://activemq.apache.org/schema/core"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.org/config/1.0 http://activemq.apache.org/schema/activemq-core.xsd">
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/activemq-core.xsd">
  
  <!--  lets create an embedded ActiveMQ Broker -->
  <amq:broker useJmx="false" persistent="false">
--- a/activemq-core/src/test/resources/spring-embedded-xbean.xml
+++ b/activemq-core/src/test/resources/spring-embedded-xbean.xml
@ -19,10 +19,10 @@
 <!-- START SNIPPET: spring -->
 <beans 
  xmlns="http://www.springframework.org/schema/beans" 
-  xmlns:amq="http://activemq.org/config/1.0"
+  xmlns:amq="http://activemq.apache.org/schema/core"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.org/config/1.0 http://activemq.apache.org/schema/core/activemq-core-5.0.0.xsd">
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.0.0.xsd">
  
  <!--  lets create an embedded ActiveMQ Broker -->
  <amq:broker useJmx="false" persistent="false">
--- a/activemq-jpa-store/pom.xml
+++ b/activemq-jpa-store/pom.xml
@ -94,7 +94,7 @@
        <executions>
          <execution>
            <configuration>
-              <namespace>http://activemq.org/activemq-jpa-store/config/1.0</namespace>
+              <namespace>http://activemq.apache.org/schema/jpa-store</namespace>
              <schema>target/xbean/activemq-jpa-store.xsd</schema>
            </configuration>
            <goals>
--- a/activemq-jpa-store/src/test/resources/org/apache/activemq/broker/store/jpabroker.xml
+++ b/activemq-jpa-store/src/test/resources/org/apache/activemq/broker/store/jpabroker.xml
@ -22,7 +22,7 @@
  		brokerName="broker" 
  		persistent="false" useJmx="false" 
  		deleteAllMessagesOnStartup="true" 
-        xmlns="http://activemq.org/config/1.0" persistenceAdapter="#jpa">
+        xmlns="http://activemq.apache.org/schema/core" persistenceAdapter="#jpa">
        
     <transportConnectors>
      <transportConnector uri="tcp://localhost:0"/>
--- a/activemq-jpa-store/src/test/resources/org/apache/activemq/broker/store/quickjpabroker.xml
+++ b/activemq-jpa-store/src/test/resources/org/apache/activemq/broker/store/quickjpabroker.xml
@ -22,7 +22,7 @@
  		brokerName="broker" 
  		persistent="false" useJmx="false" 
  		deleteAllMessagesOnStartup="true" 
-        xmlns="http://activemq.org/config/1.0">
+        xmlns="http://activemq.apache.org/schema/core">
        
    <transportConnectors>
      <transportConnector uri="tcp://localhost:0"/>
--- a/activemq-perftest/src/main/resources/broker-conf/activemq.xml
+++ b/activemq-perftest/src/main/resources/broker-conf/activemq.xml
@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <!-- START SNIPPET: xbean -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans xmlns="http://activemq.apache.org/schema/core">
  
  <broker useJmx="false" brokerName="defaultBroker" start="false" persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true">
    <persistenceAdapter>
--- a/activemq-perftest/src/main/resources/broker-conf/jdbc.xml
+++ b/activemq-perftest/src/main/resources/broker-conf/jdbc.xml
@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <!-- START SNIPPET: xbean -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans xmlns="http://activemq.apache.org/schema/core">
  
  <broker useJmx="false" brokerName="jdbcBroker" start="false" persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true" advisorySupport="false">
    <persistenceAdapter>
--- a/activemq-perftest/src/main/resources/broker-conf/journaledMem.xml
+++ b/activemq-perftest/src/main/resources/broker-conf/journaledMem.xml
@ -16,7 +16,7 @@
    limitations under the License.
 -->

-<beans xmlns:amq="http://activemq.org/config/1.0">
+<beans xmlns:amq="http://activemq.apache.org/schema/core">

    <amq:broker brokerName="journaledMemBroker" start="false" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true" advisorySupport="false">

--- a/activemq-perftest/src/main/resources/broker-conf/kaha.xml
+++ b/activemq-perftest/src/main/resources/broker-conf/kaha.xml
@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <!-- START SNIPPET: xbean -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans xmlns="http://activemq.apache.org/schema/core">
  
  <broker useJmx="false" brokerName="kahaBroker" start="false" persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true" advisorySupport="false">
    <persistenceAdapter>
--- a/activemq-perftest/src/main/resources/broker-conf/memory.xml
+++ b/activemq-perftest/src/main/resources/broker-conf/memory.xml
@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <!-- START SNIPPET: xbean -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans xmlns="http://activemq.apache.org/schema/core">
  
  <broker useJmx="false" brokerName="memoryBroker" start="false" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true" advisorySupport="false">
    <persistenceAdapter>
--- a/activemq-perftest/src/main/resources/broker-conf/quickJdbc.xml
+++ b/activemq-perftest/src/main/resources/broker-conf/quickJdbc.xml
@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <!-- START SNIPPET: xbean -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans xmlns="http://activemq.apache.org/schema/core">
  
  <broker useJmx="false" brokerName="quickJdbcBroker" start="false" persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true" advisorySupport="false">
    <persistenceAdapter>
--- a/activemq-perftest/src/main/resources/broker-conf/quickMem.xml
+++ b/activemq-perftest/src/main/resources/broker-conf/quickMem.xml
@ -16,7 +16,7 @@
    limitations under the License.
 -->

-<beans xmlns:amq="http://activemq.org/config/1.0">
+<beans xmlns:amq="http://activemq.apache.org/schema/core">

    <amq:broker brokerName="quickMemBroker" start="false" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true" advisorySupport="false">

--- a/activemq-perftest/src/main/resources/broker-conf/rapid.xml
+++ b/activemq-perftest/src/main/resources/broker-conf/rapid.xml
@ -16,7 +16,7 @@
    limitations under the License.
 -->

-<beans xmlns:amq="http://activemq.org/config/1.0">
+<beans xmlns:amq="http://activemq.apache.org/schema/core">

    <amq:broker brokerName="rapidBroker" start="false" persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true" advisorySupport="false">

--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@ -83,7 +83,7 @@
        <executions>
          <execution>
            <configuration>
-              <namespace>http://activemq.org/ra/1.0</namespace>
+              <namespace>http://activemq.apache.org/schema/ra</namespace>
            </configuration>
            <goals>
              <goal>mapping</goal>
--- a/activemq-rar/src/main/rar/broker-config.xml
+++ b/activemq-rar/src/main/rar/broker-config.xml
@ -16,7 +16,7 @@
    limitations under the License.
 -->
 <!-- START SNIPPET: xbean -->
-<beans xmlns="http://activemq.org/config/1.0">
+<beans xmlns="http://activemq.apache.org/schema/core">

  <broker useJmx="true">

--- a/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
+++ b/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
@ -18,7 +18,7 @@
 <beans>


-  <broker useJmx="true" xmlns="http://activemq.org/config/1.0">
+  <broker useJmx="true" xmlns="http://activemq.apache.org/schema/core">

    <!-- In ActiveMQ 4, you can setup destination policies -->
    <destinationPolicy>
@ -56,7 +56,7 @@
  </broker>

  <!-- lets create a command agent to respond to admin commands over JMS or XMPP on the ActiveMQ.Agent topic -->
-  <commandAgent xmlns="http://activemq.org/config/1.0"/>
+  <commandAgent xmlns="http://activemq.apache.org/schema/core"/>

 </beans>
        <!-- END SNIPPET: xbean -->
--- a/assembly/src/release/conf/activemq.xml
+++ b/assembly/src/release/conf/activemq.xml
@ -17,16 +17,16 @@
 <!-- START SNIPPET: example -->
 <beans
  xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.org/config/1.0"
+  xmlns:amq="http://activemq.apache.org/schema/core"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.org/config/1.0 http://activemq.apache.org/schema/core/activemq-core-VERSION.xsd   
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-VERSION.xsd   
  http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">

    <!-- Allows us to use system properties as variables in this configuration file -->
    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-    <broker xmlns="http://activemq.org/config/1.0" brokerName="localhost" dataDirectory="${activemq.base}/data">
+    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="${activemq.base}/data">

        <!-- Destination specific policies using destination names or wildcards -->
        <destinationPolicy>
@ -123,7 +123,7 @@


    <!-- lets create a command agent to respond to message based admin commands on the ActiveMQ.Agent topic -->
-    <commandAgent xmlns="http://activemq.org/config/1.0" brokerUrl="vm://localhost"/>
+    <commandAgent xmlns="http://activemq.apache.org/schema/core" brokerUrl="vm://localhost"/>


    <!-- An embedded servlet engine for serving up the Admin console -->
--- a/assembly/src/release/example/conf/activemq.xml
+++ b/assembly/src/release/example/conf/activemq.xml
@ -17,14 +17,14 @@
 <!-- START SNIPPET: xbean -->
 <beans
  xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.org/config/1.0"
+  xmlns:amq="http://activemq.apache.org/schema/core"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.org/config/1.0 http://activemq.apache.org/schema/core/activemq-core-VERSION.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-VERSION.xsd
  http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">

  
-  <broker xmlns="http://activemq.org/config/1.0" useJmx="false">
+  <broker xmlns="http://activemq.apache.org/schema/core" useJmx="false">

    <persistenceAdapter>
      <journaledJDBC journalLogFiles="5" dataDirectory="../data"/>
--- a/assembly/src/sample-conf/jdbc-example.xml
+++ b/assembly/src/sample-conf/jdbc-example.xml
@ -17,7 +17,7 @@
 <!-- START SNIPPET: xbean -->
 <beans>
  
-  <broker useJmx="false" brokerName="jdbcBroker" xmlns="http://activemq.org/config/1.0">
+  <broker useJmx="false" brokerName="jdbcBroker" xmlns="http://activemq.apache.org/schema/core">
    <persistenceAdapter>
       <jdbcPersistenceAdapter dataSource="#derby-ds"/>
    </persistenceAdapter>
--- a/assembly/src/sample-conf/journaledMem-example.xml
+++ b/assembly/src/sample-conf/journaledMem-example.xml
@ -16,7 +16,7 @@
    limitations under the License.
 -->

-<beans xmlns:amq="http://activemq.org/config/1.0">
+<beans xmlns:amq="http://activemq.apache.org/schema/core">

    <amq:broker brokerName="journaledMemBroker" start="false" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true" advisorySupport="false">

--- a/assembly/src/sample-conf/kaha-example.xml
+++ b/assembly/src/sample-conf/kaha-example.xml
@ -18,7 +18,7 @@
 <beans>
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

-  <broker brokerName="broker" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="broker" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
     <transportConnectors>
      <transportConnector uri="tcp://localhost:61616"/>
    </transportConnectors>
--- a/assembly/src/sample-conf/memory-example.xml
+++ b/assembly/src/sample-conf/memory-example.xml
@ -17,7 +17,7 @@
 <!-- START SNIPPET: xbean -->
 <beans>
  
-  <broker useJmx="false" brokerName="memoryBroker" xmlns="http://activemq.org/config/1.0">
+  <broker useJmx="false" brokerName="memoryBroker" xmlns="http://activemq.apache.org/schema/core">
    <persistenceAdapter>
       <memoryPersistenceAdapter/>
    </persistenceAdapter>
--- a/assembly/src/sample-conf/multicastNetwork-example.xml
+++ b/assembly/src/sample-conf/multicastNetwork-example.xml
@ -17,7 +17,7 @@
 <!-- START SNIPPET: example -->
 <beans>

-  <broker name="b1" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+  <broker name="b1" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
    <transportConnectors>
      <transportConnector uri="tcp://localhost:61001" discoveryUri="multicast://default"/>
    </transportConnectors>
--- a/assembly/src/sample-conf/quickJdbc-example.xml
+++ b/assembly/src/sample-conf/quickJdbc-example.xml
@ -17,7 +17,7 @@
 <!-- START SNIPPET: xbean -->
 <beans>
  
-  <broker useJmx="false" brokerName="quickJdbcBroker" xmlns="http://activemq.org/config/1.0">
+  <broker useJmx="false" brokerName="quickJdbcBroker" xmlns="http://activemq.apache.org/schema/core">
    <persistenceAdapter>
       <journaledJDBC journalLogFiles="4" 
                      journalLogFileSize="32768" 
--- a/assembly/src/sample-conf/quickMem-example.xml
+++ b/assembly/src/sample-conf/quickMem-example.xml
@ -16,7 +16,7 @@
    limitations under the License.
 -->

-<beans xmlns:amq="http://activemq.org/config/1.0">
+<beans xmlns:amq="http://activemq.apache.org/schema/core">

    <amq:broker brokerName="quickMemBroker" start="false" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true" advisorySupport="false">

--- a/assembly/src/sample-conf/rapid-example.xml
+++ b/assembly/src/sample-conf/rapid-example.xml
@ -16,7 +16,7 @@
    limitations under the License.
 -->

-<beans xmlns:amq="http://activemq.org/config/1.0">
+<beans xmlns:amq="http://activemq.apache.org/schema/core">

    <amq:broker brokerName="rapidBroker" start="false" persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true" advisorySupport="false">

--- a/assembly/src/sample-conf/staticNetwork-example.xml
+++ b/assembly/src/sample-conf/staticNetwork-example.xml
@ -17,7 +17,7 @@
 <!-- START SNIPPET: example -->
 <beans>

-  <broker brokerName="broker" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+  <broker brokerName="broker" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
    <transportConnectors>
      <transportConnector uri="tcp://localhost:62001"/>
    </transportConnectors>