Author: ffang
Date: Mon Feb 23 06:10:49 2009
New Revision: 746894
URL: http://svn.apache.org/viewvc?rev=746894&view=rev
Log:
[SM-1810]should use new activemq namsespace instead of the old one
Modified:
servicemix/smx3/trunk/common/servicemix-components/src/test/resources/broker.xml
servicemix/smx3/trunk/common/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/broker.xml
servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/client/remote.xml
servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jca/broker.xml
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance1/servicemix1.xml
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/servicemix.xml
servicemix/smx3/trunk/pom.xml
servicemix/smx3/trunk/samples/basic/src/main/resources/servicemix.xml
servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/src/test/resources/integrationTest.xml
servicemix/smx3/trunk/samples/servicemix-web/src/webapp/WEB-INF/activemq.xml
servicemix/smx3/trunk/servicemix-itests/src/test/resources/org/apache/servicemix/itests/deadlock/servicemix-deadlock.xml
servicemix/smx3/trunk/servicemix-itests/src/test/resources/org/apache/servicemix/itests/httpjms.xml
Modified:
servicemix/smx3/trunk/common/servicemix-components/src/test/resources/broker.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/resources/broker.xml?rev=746894&r1=746893&r2=746894&view=diff
==============================================================================
---
servicemix/smx3/trunk/common/servicemix-components/src/test/resources/broker.xml
(original)
+++
servicemix/smx3/trunk/common/servicemix-components/src/test/resources/broker.xml
Mon Feb 23 06:10:49 2009
@@ -19,7 +19,7 @@
-->
<beans>
- <broker persistent="false" xmlns="http://activemq.org/config/1.0";>
+ <broker persistent="false" xmlns="http://activemq.apache.org/schema/core";>
<transportConnectors>
<transportConnector uri="tcp://localhost:61626" />
Modified:
servicemix/smx3/trunk/common/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/broker.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/broker.xml?rev=746894&r1=746893&r2=746894&view=diff
==============================================================================
---
servicemix/smx3/trunk/common/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/broker.xml
(original)
+++
servicemix/smx3/trunk/common/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/broker.xml
Mon Feb 23 06:10:49 2009
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<beans xmlns="http://activemq.org/config/1.0";>
+<beans xmlns="http://activemq.apache.org/schema/core";>
<broker persistent="false">
Modified:
servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/client/remote.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/client/remote.xml?rev=746894&r1=746893&r2=746894&view=diff
==============================================================================
---
servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/client/remote.xml
(original)
+++
servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/client/remote.xml
Mon Feb 23 06:10:49 2009
@@ -18,7 +18,7 @@
-->
<beans xmlns:sm="http://servicemix.apache.org/config/1.0";
- xmlns:amq="http://activemq.org/config/1.0";
+ xmlns:amq="http://activemq.apache.org/schema/core";
xmlns:foo="http://servicemix.org/cheese";>
Modified:
servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jca/broker.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jca/broker.xml?rev=746894&r1=746893&r2=746894&view=diff
==============================================================================
---
servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jca/broker.xml
(original)
+++
servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jca/broker.xml
Mon Feb 23 06:10:49 2009
@@ -21,7 +21,7 @@
<!-- START SNIPPET: xbean -->
<beans>
- <broker xmlns="http://activemq.org/config/1.0"; persistent="false"
useJmx="false">
+ <broker xmlns="http://activemq.apache.org/schema/core"; persistent="false"
useJmx="false">
<transportConnectors>
<transportConnector uri="tcp://localhost:61216" />
Modified:
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml?rev=746894&r1=746893&r2=746894&view=diff
==============================================================================
---
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml
(original)
+++
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml
Mon Feb 23 06:10:49 2009
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<beans xmlns:amq="http://activemq.org/config/1.0";>
+<beans xmlns:amq="http://activemq.apache.org/schema/core";>
<!-- ActiveMQ JMS Broker configuration -->
<amq:broker id="broker" depends-on="jmxServer" useShutdownHook="false">
Modified:
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml?rev=746894&r1=746893&r2=746894&view=diff
==============================================================================
---
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml
(original)
+++
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml
Mon Feb 23 06:10:49 2009
@@ -20,7 +20,7 @@
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
"http://www.springframework.org/dtd/spring-beans.dtd";>
<!-- START SNIPPET: jndi -->
<beans xmlns:jencks="http://jencks.org/2.0";
- xmlns:amq="http://activemq.org/config/1.0";
+ xmlns:amq="http://activemq.apache.org/schema/core";
xmlns:amqra="http://activemq.apache.org/schema/ra";
xmlns:util="http://www.springframework.org/schema/util";>
Modified:
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance1/servicemix1.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance1/servicemix1.xml?rev=746894&r1=746893&r2=746894&view=diff
==============================================================================
---
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance1/servicemix1.xml
(original)
+++
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance1/servicemix1.xml
Mon Feb 23 06:10:49 2009
@@ -18,7 +18,7 @@
-->
<beans xmlns:sm="http://servicemix.apache.org/config/1.0";
- xmlns:amq="http://activemq.org/config/1.0";
+ xmlns:amq="http://activemq.apache.org/schema/core";
xmlns:test="http://servicemix.org/test";>
<bean id="jndi"
class="org.apache.xbean.spring.jndi.SpringInitialContextFactory"
factory-method="makeInitialContext" singleton="true" />
Modified:
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml?rev=746894&r1=746893&r2=746894&view=diff
==============================================================================
---
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
(original)
+++
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
Mon Feb 23 06:10:49 2009
@@ -18,7 +18,7 @@
-->
<beans xmlns:sm="http://servicemix.apache.org/config/1.0";
- xmlns:amq="http://activemq.org/config/1.0";
+ xmlns:amq="http://activemq.apache.org/schema/core";
xmlns:test="http://servicemix.org/test";
xmlns:my="http://servicemix.apache.org/demo";
xmlns:wsn="http://servicemix.apache.org/wsn/1.0";>
Modified:
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml?rev=746894&r1=746893&r2=746894&view=diff
==============================================================================
---
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml
(original)
+++
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml
Mon Feb 23 06:10:49 2009
@@ -18,7 +18,7 @@
-->
<beans xmlns:sm="http://servicemix.apache.org/config/1.0";
- xmlns:amq="http://activemq.org/config/1.0";
+ xmlns:amq="http://activemq.apache.org/schema/core";
xmlns:test="http://servicemix.org/test";
xmlns:my="http://servicemix.apache.org/demo";
xmlns:wsn="http://servicemix.apache.org/wsn/1.0";>
Modified:
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/servicemix.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/servicemix.xml?rev=746894&r1=746893&r2=746894&view=diff
==============================================================================
---
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/servicemix.xml
(original)
+++
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/servicemix.xml
Mon Feb 23 06:10:49 2009
@@ -18,7 +18,7 @@
-->
<beans xmlns:sm="http://servicemix.apache.org/config/1.0";
- xmlns:amq="http://activemq.org/config/1.0";
+ xmlns:amq="http://activemq.apache.org/schema/core";
xmlns:util="http://www.springframework.org/schema/util";>
<sm:rmiRegistry id="rmiRegistry" port="1099" />
Modified: servicemix/smx3/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=746894&r1=746893&r2=746894&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Mon Feb 23 06:10:49 2009
@@ -86,7 +86,7 @@
<spring-version>2.5.5</spring-version>
<activemq-version>5.2.0</activemq-version>
<activeio-version>3.1.0</activeio-version>
- <camel-version>1.4.0</camel-version>
+ <camel-version>1.5.0</camel-version>
<jencks-version>2.1</jencks-version>
<jetty-version>6.1.12rc1</jetty-version>
<geronimo-version>2.0.1</geronimo-version>
Modified: servicemix/smx3/trunk/samples/basic/src/main/resources/servicemix.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/basic/src/main/resources/servicemix.xml?rev=746894&r1=746893&r2=746894&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/basic/src/main/resources/servicemix.xml
(original)
+++ servicemix/smx3/trunk/samples/basic/src/main/resources/servicemix.xml Mon
Feb 23 06:10:49 2009
@@ -20,7 +20,7 @@
<beans xmlns="http://xbean.org/schemas/spring/1.0";
xmlns:sm="http://servicemix.apache.org/config/1.0";
xmlns:jms="http://servicemix.apache.org/jms/1.0";
- xmlns:amq="http://activemq.org/config/1.0";
+ xmlns:amq="http://activemq.apache.org/schema/core";
xmlns:amqra="http://activemq.apache.org/schema/ra";
xmlns:amqpool="http://jencks.org/amqpool/2.0";
xmlns:jencks="http://jencks.org/2.0";
Modified:
servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/src/test/resources/integrationTest.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/src/test/resources/integrationTest.xml?rev=746894&r1=746893&r2=746894&view=diff
==============================================================================
---
servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/src/test/resources/integrationTest.xml
(original)
+++
servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/src/test/resources/integrationTest.xml
Mon Feb 23 06:10:49 2009
@@ -23,11 +23,11 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://servicemix.apache.org/config/1.0
http://repo1.maven.org/maven2/org/apache/servicemix/servicemix-core/3.1.2/servicemix-core-3.1.2.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";>
<!-- Run a local ActiveMQ broker for testing -->
- <broker xmlns="http://activemq.org/config/1.0"; brokerName="localhost"
persistent="false">
+ <broker xmlns="http://activemq.apache.org/schema/core";
brokerName="localhost" persistent="false">
<transportConnectors>
<transportConnector name="openwire" uri="tcp://localhost:61616"/>
</transportConnectors>
Modified:
servicemix/smx3/trunk/samples/servicemix-web/src/webapp/WEB-INF/activemq.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/servicemix-web/src/webapp/WEB-INF/activemq.xml?rev=746894&r1=746893&r2=746894&view=diff
==============================================================================
---
servicemix/smx3/trunk/samples/servicemix-web/src/webapp/WEB-INF/activemq.xml
(original)
+++
servicemix/smx3/trunk/samples/servicemix-web/src/webapp/WEB-INF/activemq.xml
Mon Feb 23 06:10:49 2009
@@ -18,7 +18,7 @@
-->
<!-- START SNIPPET: xbean -->
-<beans xmlns:amq="http://activemq.org/config/1.0";>
+<beans xmlns:amq="http://activemq.apache.org/schema/core";>
<amq:broker id="broker" depends-on="jmxServer">
Modified:
servicemix/smx3/trunk/servicemix-itests/src/test/resources/org/apache/servicemix/itests/deadlock/servicemix-deadlock.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/servicemix-itests/src/test/resources/org/apache/servicemix/itests/deadlock/servicemix-deadlock.xml?rev=746894&r1=746893&r2=746894&view=diff
==============================================================================
---
servicemix/smx3/trunk/servicemix-itests/src/test/resources/org/apache/servicemix/itests/deadlock/servicemix-deadlock.xml
(original)
+++
servicemix/smx3/trunk/servicemix-itests/src/test/resources/org/apache/servicemix/itests/deadlock/servicemix-deadlock.xml
Mon Feb 23 06:10:49 2009
@@ -19,7 +19,7 @@
-->
<beans xmlns:sm="http://servicemix.apache.org/config/1.0";
xmlns:rac="http://example.com/performancetest";
xmlns:jms="http://servicemix.apache.org/jms/1.0";
- xmlns:amq="http://activemq.org/config/1.0";
xmlns:eip="http://servicemix.apache.org/eip/1.0";>
+ xmlns:amq="http://activemq.apache.org/schema/core";
xmlns:eip="http://servicemix.apache.org/eip/1.0";>
<bean id="jndi"
class="org.apache.xbean.spring.jndi.SpringInitialContextFactory"
factory-method="makeInitialContext" singleton="true">
Modified:
servicemix/smx3/trunk/servicemix-itests/src/test/resources/org/apache/servicemix/itests/httpjms.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/servicemix-itests/src/test/resources/org/apache/servicemix/itests/httpjms.xml?rev=746894&r1=746893&r2=746894&view=diff
==============================================================================
---
servicemix/smx3/trunk/servicemix-itests/src/test/resources/org/apache/servicemix/itests/httpjms.xml
(original)
+++
servicemix/smx3/trunk/servicemix-itests/src/test/resources/org/apache/servicemix/itests/httpjms.xml
Mon Feb 23 06:10:49 2009
@@ -22,7 +22,7 @@
xmlns:http="http://servicemix.apache.org/http/1.0";
xmlns:eip="http://servicemix.apache.org/eip/1.0";
xmlns:jms="http://servicemix.apache.org/jms/1.0";
- xmlns:amq="http://activemq.org/config/1.0";
+ xmlns:amq="http://activemq.apache.org/schema/core";
xmlns:test="http://servicemix.org/test";>
<sm:container id="jbi" embedded="true" depends-on="broker">
