You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/06/20 17:07:50 UTC
svn commit: r549125 - in /activemq/camel/trunk: camel-core/
components/camel-jms/src/test/resources/org/apache/camel/component/jms/
components/camel-script/src/test/resources/org/apache/camel/builder/script/example/
components/camel-spring/ components/...
Author: jstrachan
Date: Wed Jun 20 08:07:48 2007
New Revision: 549125
URL: http://svn.apache.org/viewvc?view=rev&rev=549125
Log:
updated the namespace and xsd location based on feedback on the ActiveMQ project: http://www.nabble.com/Handling-XSDs-and-Spring-2-XML-processing-etc.-tf3921424s2354.html
Added:
activemq/camel/trunk/components/camel-spring/src/main/resources/org/apache/camel/spring/camel-spring.xsd (contents, props changed)
- copied, changed from r549046, activemq/camel/trunk/components/camel-spring/src/main/resources/org/apache/camel/spring/camel-1.0.xsd
Removed:
activemq/camel/trunk/components/camel-spring/src/main/resources/org/apache/camel/spring/camel-1.0.xsd
Modified:
activemq/camel/trunk/camel-core/pom.xml
activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringAndJmsNameTest.xml
activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringTest.xml
activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringWithAutoWireTest.xml
activemq/camel/trunk/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/groovyFilter.xml
activemq/camel/trunk/components/camel-spring/README.txt
activemq/camel/trunk/components/camel-spring/pom.xml
activemq/camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.handlers
activemq/camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.schemas
activemq/camel/trunk/components/camel-spring/src/test/resources/META-INF/spring/camel-context.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/builder/spring_route_builder_test.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/camelContextFactoryBeanTest.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/contentBasedRoute.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/endpointReference.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/example/pojoConsumer.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/example/pojoSender.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/example/xpathFilter.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/examples.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/injectedBeanTest.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/spring.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/routingUsingCamelContextFactoryTest.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/routingUsingProcessor.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessor.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessorWithFilter.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildDynamicRecipientList.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildIdempotentConsumer.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildRouteWithInterceptor.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRoute.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithChoice.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithHeaderPredicate.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildStaticRecipientList.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildWireTap.xml
activemq/camel/trunk/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml
activemq/camel/trunk/tooling/archetypes/camel-router/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
Modified: activemq/camel/trunk/camel-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/pom.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/camel-core/pom.xml (original)
+++ activemq/camel/trunk/camel-core/pom.xml Wed Jun 20 08:07:48 2007
@@ -69,8 +69,8 @@
<executions>
<execution>
<configuration>
- <namespace>http://activemq.apache.org/camel/camel-1.0.xsd</namespace>
- <schema>target/xbean/camel-1.0.xsd</schema>
+ <namespace>http://activemq.apache.org/camel/camel-spring.xsd</namespace>
+ <schema>target/xbean/camel-spring.xsd</schema>
</configuration>
<goals>
<goal>mapping</goal>
Modified: activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringAndJmsNameTest.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringAndJmsNameTest.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringAndJmsNameTest.xml (original)
+++ activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringAndJmsNameTest.xml Wed Jun 20 08:07:48 2007
@@ -19,11 +19,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!-- START SNIPPET: example -->
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
</camelContext>
<bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
Modified: activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringTest.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringTest.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringTest.xml (original)
+++ activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringTest.xml Wed Jun 20 08:07:48 2007
@@ -19,11 +19,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!-- START SNIPPET: example -->
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
</camelContext>
<bean id="activemq" class="org.apache.camel.component.jms.JmsComponent">
Modified: activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringWithAutoWireTest.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringWithAutoWireTest.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringWithAutoWireTest.xml (original)
+++ activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsRouteUsingSpringWithAutoWireTest.xml Wed Jun 20 08:07:48 2007
@@ -19,11 +19,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!-- START SNIPPET: example -->
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
</camelContext>
<bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
Modified: activemq/camel/trunk/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/groovyFilter.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/groovyFilter.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/groovyFilter.xml (original)
+++ activemq/camel/trunk/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/groovyFilter.xml Wed Jun 20 08:07:48 2007
@@ -19,11 +19,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!-- START SNIPPET: example -->
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="direct:start"/>
<filter>
Modified: activemq/camel/trunk/components/camel-spring/README.txt
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/README.txt?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/README.txt (original)
+++ activemq/camel/trunk/components/camel-spring/README.txt Wed Jun 20 08:07:48 2007
@@ -29,8 +29,8 @@
I've been using trang for that purpose. Once installed, you can run:
- trang -I xml -O xsd src/test/resources/org/apache/camel/spring/examples.xml src/main/resources/org/apache/camel/spring/generated-camel-1.0.xsd
+ trang -I xml -O xsd src/test/resources/org/apache/camel/spring/examples.xml src/main/resources/org/apache/camel/spring/generated-camel-spring.xsd
To generate the XSD, there are some spring specifics mostly in the header
that trang does not get right, so then what's left is a manual cut and paste from
- the generated-camel-1.0.xsd to the camel-1.0.xsd
+ the generated-camel-spring.xsd to the camel-spring.xsd
Modified: activemq/camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/pom.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/pom.xml (original)
+++ activemq/camel/trunk/components/camel-spring/pom.xml Wed Jun 20 08:07:48 2007
@@ -83,7 +83,7 @@
<echo>Running the XSDDoc task</echo>
<taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task"/>
<mkdir dir="${basedir}/target/site/xsddoc"/>
- <xsddoc file="${basedir}/src/main/resources/org/apache/camel/spring/camel-1.0.xsd"
+ <xsddoc file="${basedir}/src/main/resources/org/apache/camel/spring/camel-spring.xsd"
out="${basedir}/target/site/xsddoc"
doctitle="Apache Camel XML Schema Reference"
header="<a href='http://activemq.apache.org/camel/'>Apache Camel</a>"
@@ -121,7 +121,7 @@
<configuration>
<artifacts>
<artifact>
- <file>${basedir}/src/main/resources/org/apache/camel/spring/camel-1.0.xsd</file>
+ <file>${basedir}/src/main/resources/org/apache/camel/spring/camel-spring.xsd</file>
<type>xsd</type>
</artifact>
</artifacts>
Modified: activemq/camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.handlers
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.handlers?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.handlers (original)
+++ activemq/camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.handlers Wed Jun 20 08:07:48 2007
@@ -15,4 +15,4 @@
# limitations under the License.
#
-http\://activemq.apache.org/camel/schema/camel-1.0.xsd=org.apache.camel.spring.xml.CamelNamespaceHandler
\ No newline at end of file
+http\://activemq.apache.org/camel/schema/spring=org.apache.camel.spring.xml.CamelNamespaceHandler
\ No newline at end of file
Modified: activemq/camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.schemas?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.schemas (original)
+++ activemq/camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.schemas Wed Jun 20 08:07:48 2007
@@ -15,4 +15,7 @@
# limitations under the License.
#
-http\://activemq.apache.org/camel/schema/camel-1.0.xsd=org/apache/camel/spring/camel-1.0.xsd
\ No newline at end of file
+http\://activemq.apache.org/camel/schema/spring/camel-spring.xsd=org/apache/camel/spring/camel-spring.xsd
+
+http\://activemq.apache.org/camel/schema/spring/camel-spring-1.0.xsd=org/apache/camel/spring/camel-spring.xsd
+http\://activemq.apache.org/camel/schema/spring/camel-spring-1.0-SNAPSHOT.xsd=org/apache/camel/spring/camel-spring.xsd
\ No newline at end of file
Copied: activemq/camel/trunk/components/camel-spring/src/main/resources/org/apache/camel/spring/camel-spring.xsd (from r549046, activemq/camel/trunk/components/camel-spring/src/main/resources/org/apache/camel/spring/camel-1.0.xsd)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/resources/org/apache/camel/spring/camel-spring.xsd?view=diff&rev=549125&p1=activemq/camel/trunk/components/camel-spring/src/main/resources/org/apache/camel/spring/camel-1.0.xsd&r1=549046&p2=activemq/camel/trunk/components/camel-spring/src/main/resources/org/apache/camel/spring/camel-spring.xsd&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/main/resources/org/apache/camel/spring/camel-1.0.xsd (original)
+++ activemq/camel/trunk/components/camel-spring/src/main/resources/org/apache/camel/spring/camel-spring.xsd Wed Jun 20 08:07:48 2007
@@ -19,8 +19,8 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
- targetNamespace="http://activemq.apache.org/camel/schema/camel-1.0.xsd"
- xmlns:c="http://activemq.apache.org/camel/schema/camel-1.0.xsd"
+ targetNamespace="http://activemq.apache.org/camel/schema/spring"
+ xmlns:c="http://activemq.apache.org/camel/schema/spring"
xmlns:s="http://www.springframework.org/schema/beans"
>
Propchange: activemq/camel/trunk/components/camel-spring/src/main/resources/org/apache/camel/spring/camel-spring.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/META-INF/spring/camel-context.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/META-INF/spring/camel-context.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/META-INF/spring/camel-context.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/META-INF/spring/camel-context.xml Wed Jun 20 08:07:48 2007
@@ -27,9 +27,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd" packages="org.apache.camel.builder.RouteBuilder">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring" packages="org.apache.camel.builder.RouteBuilder">
</camelContext>
</beans>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/builder/spring_route_builder_test.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/builder/spring_route_builder_test.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/builder/spring_route_builder_test.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/builder/spring_route_builder_test.xml Wed Jun 20 08:07:48 2007
@@ -19,7 +19,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
@@ -33,7 +33,7 @@
from("queue:a").to("queue:b");
-->
<!-- START SNIPPET: e1 -->
- <camelContext id="buildSimpleRoute" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="buildSimpleRoute" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<to uri="queue:b"/>
@@ -45,7 +45,7 @@
from("queue:a").filter(header("foo").isEqualTo("bar")).to("queue:b");
-->
<!-- START SNIPPET: e2 -->
- <camelContext id="buildSimpleRouteWithHeaderPredicate" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="buildSimpleRouteWithHeaderPredicate" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<filter>
@@ -67,7 +67,7 @@
.otherwise().to("queue:d");
-->
<!-- START SNIPPET: e3 -->
- <camelContext id="buildSimpleRouteWithChoice" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="buildSimpleRouteWithChoice" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<choice>
@@ -99,7 +99,7 @@
-->
<!-- START SNIPPET: e4 -->
<bean id="myProcessor" class="org.apache.camel.builder.MyProcessor"/>
- <camelContext id="buildCustomProcessor" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="buildCustomProcessor" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<process ref="#myProcessor"/>
@@ -111,7 +111,7 @@
from("queue:a").filter(header("foo").isEqualTo("bar")).process(myProcessor);
-->
<!-- START SNIPPET: e5 -->
- <camelContext id="buildCustomProcessorWithFilter" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="buildCustomProcessorWithFilter" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<filter>
@@ -130,7 +130,7 @@
from("queue:a").to("queue:tap", "queue:b");
-->
<!-- START SNIPPET: e6-->
- <camelContext id="buildWireTap" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="buildWireTap" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<to>
@@ -152,7 +152,7 @@
<!-- START SNIPPET: e7 -->
<bean id="interceptor1" class="org.apache.camel.builder.MyInterceptorProcessor"/>
<bean id="interceptor2" class="org.apache.camel.builder.MyInterceptorProcessor"/>
- <camelContext id="buildRouteWithInterceptor" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="buildRouteWithInterceptor" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<intercept>
@@ -168,7 +168,7 @@
from("queue:a").to("queue:b", "queue:c", "queue:d");
-->
<!-- START SNIPPET: e8 -->
- <camelContext id="buildStaticRecipientList" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="buildStaticRecipientList" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<to>
@@ -185,7 +185,7 @@
from("queue:a").recipientList(header("foo"));
-->
<!-- START SNIPPET: e9 -->
- <camelContext id="buildDynamicRecipientList" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="buildDynamicRecipientList" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<recipientList>
@@ -201,7 +201,7 @@
from("queue:a").splitter(bodyAs(String.class).tokenize("\n")).to("queue:b");
-->
<!-- START SNIPPET: splitter -->
- <camelContext id="buildSplitter" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="buildSplitter" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<splitter>
@@ -220,7 +220,7 @@
from("queue:a").idempotentConsumer(header("myMessageId"), memoryMessageIdRepository()).to("queue:b");
-->
<!-- START SNIPPET: idempotent -->
- <camelContext id="buildIdempotentConsumer" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="buildIdempotentConsumer" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<!--
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/camelContextFactoryBeanTest.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/camelContextFactoryBeanTest.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/camelContextFactoryBeanTest.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/camelContextFactoryBeanTest.xml Wed Jun 20 08:07:48 2007
@@ -19,7 +19,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!-- START SNIPPET: example -->
@@ -29,7 +29,7 @@
<!-- END SNIPPET: example -->
<!-- START SNIPPET: example2 -->
- <camelContext id="camel2" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel2" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:test.c"/>
<to uri="queue:test.d"/>
@@ -38,7 +38,7 @@
<!-- END SNIPPET: example2 -->
<!-- START SNIPPET: example3 -->
- <camelContext id="camel3" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd"
+ <camelContext id="camel3" xmlns="http://activemq.apache.org/camel/schema/spring"
packages="org.apache.camel.spring.example"/>
<!-- END SNIPPET: example3 -->
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/contentBasedRoute.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/contentBasedRoute.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/contentBasedRoute.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/contentBasedRoute.xml Wed Jun 20 08:07:48 2007
@@ -19,11 +19,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!-- START SNIPPET: example -->
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<endpoint id="endpoint1" uri="direct:start"/>
<endpoint id="endpoint2" uri="mock:matched"/>
<endpoint id="endpoint3" uri="mock:notMatched"/>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/endpointReference.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/endpointReference.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/endpointReference.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/endpointReference.xml Wed Jun 20 08:07:48 2007
@@ -19,7 +19,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!-- START SNIPPET: example -->
@@ -27,7 +27,7 @@
<property name="endpoint" ref="endpoint1"/>
</bean>
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<endpoint id="endpoint1" uri="direct:start"/>
<endpoint id="endpoint2" uri="mock:end"/>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/example/pojoConsumer.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/example/pojoConsumer.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/example/pojoConsumer.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/example/pojoConsumer.xml Wed Jun 20 08:07:48 2007
@@ -19,11 +19,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!-- START SNIPPET: example -->
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<beanPostProcessor/>
</camelContext>
<!-- END SNIPPET: example -->
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/example/pojoSender.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/example/pojoSender.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/example/pojoSender.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/example/pojoSender.xml Wed Jun 20 08:07:48 2007
@@ -19,11 +19,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!-- START SNIPPET: example -->
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<beanPostProcessor/>
</camelContext>
<!-- END SNIPPET: example -->
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/example/xpathFilter.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/example/xpathFilter.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/example/xpathFilter.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/example/xpathFilter.xml Wed Jun 20 08:07:48 2007
@@ -19,11 +19,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!-- START SNIPPET: example -->
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="direct:start"/>
<filter>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/examples.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/examples.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/examples.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/examples.xml Wed Jun 20 08:07:48 2007
@@ -19,7 +19,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!--
@@ -27,7 +27,7 @@
(like trang) can generate a pretty good XSD.
-->
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<to uri="queue:b"/>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/injectedBeanTest.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/injectedBeanTest.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/injectedBeanTest.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/injectedBeanTest.xml Wed Jun 20 08:07:48 2007
@@ -19,10 +19,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<beanPostProcessor/>
<endpoint id="namedEndpoint1" uri="direct:namedEndpoint1"/>
</camelContext>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/spring.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/spring.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/spring.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/spring.xml Wed Jun 20 08:07:48 2007
@@ -19,7 +19,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!-- START SNIPPET: export -->
@@ -44,7 +44,7 @@
<!-- END SNIPPET: proxy -->
<!-- START SNIPPET: example -->
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="direct:say"/>
<to uri="pojo:say"/>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/routingUsingCamelContextFactoryTest.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/routingUsingCamelContextFactoryTest.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/routingUsingCamelContextFactoryTest.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/routingUsingCamelContextFactoryTest.xml Wed Jun 20 08:07:48 2007
@@ -19,11 +19,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!-- START SNIPPET: example -->
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:start"/>
<to uri="mock:result"/>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/routingUsingProcessor.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/routingUsingProcessor.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/routingUsingProcessor.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/routingUsingProcessor.xml Wed Jun 20 08:07:48 2007
@@ -19,11 +19,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!-- START SNIPPET: example -->
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="direct:start"/>
<process ref="myProcessor"/>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessor.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessor.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessor.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessor.xml Wed Jun 20 08:07:48 2007
@@ -19,7 +19,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!--
@@ -28,7 +28,7 @@
<!-- START SNIPPET: example -->
<bean id="myProcessor" class="org.apache.camel.builder.MyProcessor"/>
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<process ref="myProcessor"/>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessorWithFilter.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessorWithFilter.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessorWithFilter.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessorWithFilter.xml Wed Jun 20 08:07:48 2007
@@ -19,7 +19,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!--
@@ -28,7 +28,7 @@
<!-- START SNIPPET: example -->
<bean id="myProcessor" class="org.apache.camel.builder.MyProcessor"/>
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<filter>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildDynamicRecipientList.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildDynamicRecipientList.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildDynamicRecipientList.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildDynamicRecipientList.xml Wed Jun 20 08:07:48 2007
@@ -19,14 +19,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!--
from("queue:a").recipientList(header("foo"));
-->
<!-- START SNIPPET: example -->
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<recipientList>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildIdempotentConsumer.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildIdempotentConsumer.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildIdempotentConsumer.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildIdempotentConsumer.xml Wed Jun 20 08:07:48 2007
@@ -19,14 +19,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!--
from("queue:a").idempotentConsumer(header("myMessageId"), memoryMessageIdRepository()).to("queue:b");
-->
<!-- START SNIPPET: example -->
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<!--
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildRouteWithInterceptor.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildRouteWithInterceptor.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildRouteWithInterceptor.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildRouteWithInterceptor.xml Wed Jun 20 08:07:48 2007
@@ -19,7 +19,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!--
@@ -33,7 +33,7 @@
<bean id="interceptor1" class="org.apache.camel.builder.MyInterceptorProcessor"/>
<bean id="interceptor2" class="org.apache.camel.builder.MyInterceptorProcessor"/>
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<intercept>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRoute.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRoute.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRoute.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRoute.xml Wed Jun 20 08:07:48 2007
@@ -19,14 +19,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!--
from("queue:a").to("queue:b");
-->
<!-- START SNIPPET: example -->
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<to uri="queue:b"/>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithChoice.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithChoice.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithChoice.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithChoice.xml Wed Jun 20 08:07:48 2007
@@ -19,7 +19,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!--
@@ -29,7 +29,7 @@
.otherwise().to("queue:d");
-->
<!-- START SNIPPET: example -->
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<choice>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithHeaderPredicate.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithHeaderPredicate.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithHeaderPredicate.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithHeaderPredicate.xml Wed Jun 20 08:07:48 2007
@@ -19,14 +19,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!--
from("queue:a").filter(header("foo").isEqualTo("bar")).to("queue:b");
-->
<!-- START SNIPPET: example -->
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<filter>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml Wed Jun 20 08:07:48 2007
@@ -19,14 +19,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!--
from("queue:a").splitter(bodyAs(String.class).tokenize("\n")).to("queue:b");
-->
<!-- START SNIPPET: example -->
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<splitter>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildStaticRecipientList.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildStaticRecipientList.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildStaticRecipientList.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildStaticRecipientList.xml Wed Jun 20 08:07:48 2007
@@ -19,14 +19,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!--
from("queue:a").to("queue:b", "queue:c", "queue:d");
-->
<!-- START SNIPPET: example -->
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<to>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildWireTap.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildWireTap.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildWireTap.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildWireTap.xml Wed Jun 20 08:07:48 2007
@@ -19,14 +19,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<!--
from("queue:a").to("queue:tap", "queue:b");
-->
<!-- START SNIPPET: example -->
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="queue:a"/>
<to>
Modified: activemq/camel/trunk/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml (original)
+++ activemq/camel/trunk/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml Wed Jun 20 08:07:48 2007
@@ -27,9 +27,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd" packages="org.apache.camel.example.spring">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring" packages="org.apache.camel.example.spring">
</camelContext>
<!-- lets configure the default ActiveMQ broker URL -->
Modified: activemq/camel/trunk/tooling/archetypes/camel-router/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/tooling/archetypes/camel-router/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml?view=diff&rev=549125&r1=549124&r2=549125
==============================================================================
--- activemq/camel/trunk/tooling/archetypes/camel-router/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml (original)
+++ activemq/camel/trunk/tooling/archetypes/camel-router/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml Wed Jun 20 08:07:48 2007
@@ -22,9 +22,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/camel-1.0.xsd http://activemq.apache.org/camel/schema/camel-1.0.xsd">
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
- <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/camel-1.0.xsd" packages="org.apache.camel.example.spring">
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring" packages="org.apache.camel.example.spring">
</camelContext>
</beans>