You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2010/09/01 16:00:25 UTC
svn commit: r991542 - in /servicemix/smx4/features/trunk: ./
examples/camel-nmr/src/main/resources/META-INF/spring/
examples/camel-osgi/src/main/resources/META-INF/spring/
examples/cxf-camel-nmr/src/main/resources/META-INF/spring/
Author: gertv
Date: Wed Sep 1 14:00:25 2010
New Revision: 991542
URL: http://svn.apache.org/viewvc?rev=991542&view=rev
Log:
SMX4-586: The Camel examples uses @deprecated namespace -- patch provided by Claus Ibsen
Modified:
servicemix/smx4/features/trunk/.gitignore
servicemix/smx4/features/trunk/examples/camel-nmr/src/main/resources/META-INF/spring/beans.xml
servicemix/smx4/features/trunk/examples/camel-osgi/src/main/resources/META-INF/spring/beans.xml
servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml
Modified: servicemix/smx4/features/trunk/.gitignore
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/.gitignore?rev=991542&r1=991541&r2=991542&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/.gitignore (original)
+++ servicemix/smx4/features/trunk/.gitignore Wed Sep 1 14:00:25 2010
@@ -2,4 +2,5 @@
.classpath
.project
target
-*.i??
\ No newline at end of file
+*.i??
+velocity.log
\ No newline at end of file
Modified: servicemix/smx4/features/trunk/examples/camel-nmr/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel-nmr/src/main/resources/META-INF/spring/beans.xml?rev=991542&r1=991541&r2=991542&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel-nmr/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel-nmr/src/main/resources/META-INF/spring/beans.xml Wed Sep 1 14:00:25 2010
@@ -19,16 +19,15 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:osgi="http://www.springframework.org/schema/osgi"
- xmlns:camel-osgi="http://camel.apache.org/schema/osgi"
+ xmlns:camel="http://camel.apache.org/schema/spring"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- http://camel.apache.org/schema/osgi http://camel.apache.org/schema/osgi/camel-osgi.xsd">
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<import resource="classpath:org/apache/servicemix/camel/nmr/camel-nmr.xml" />
- <camel-osgi:camelContext xmlns="http://camel.apache.org/schema/spring">
+ <camel:camelContext xmlns="http://camel.apache.org/schema/spring">
<!-- Route periodically sent events into the NMR -->
<route>
<from uri="timer://myTimer?fixedRate=true&period=2000"/>
@@ -40,7 +39,7 @@
<bean ref="myTransform" method="transform"/>
<to uri="log:ExampleRouter"/>
</route>
- </camel-osgi:camelContext>
+ </camel:camelContext>
<bean id="myTransform" class="org.apache.servicemix.examples.camel.MyTransform">
<property name="prefix" value="MyTransform"/>
Modified: servicemix/smx4/features/trunk/examples/camel-osgi/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel-osgi/src/main/resources/META-INF/spring/beans.xml?rev=991542&r1=991541&r2=991542&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel-osgi/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel-osgi/src/main/resources/META-INF/spring/beans.xml Wed Sep 1 14:00:25 2010
@@ -19,16 +19,15 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ctx="http://www.springframework.org/schema/context"
- xmlns:osgi="http://camel.apache.org/schema/osgi"
+ xmlns:camel="http://camel.apache.org/schema/spring"
xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- http://camel.apache.org/schema/osgi http://camel.apache.org/schema/osgi/camel-osgi.xsd
http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd">
- <osgi:camelContext xmlns="http://camel.apache.org/schema/spring">
+ <camel:camelContext xmlns="http://camel.apache.org/schema/spring">
<!-- install the Java DSL route builder -->
<package>org.apache.servicemix.examples.camel</package>
<!-- install the route which is defined with xml tags -->
@@ -37,7 +36,7 @@
<bean ref="myTransform" method="transform"/>
<to uri="log:ExampleRouter"/>
</route>
- </osgi:camelContext>
+ </camel:camelContext>
<bean id="myTransform" class="org.apache.servicemix.examples.camel.MyTransform">
<property name="prefix" value="${prefix}"/>
Modified: servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml?rev=991542&r1=991541&r2=991542&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml Wed Sep 1 14:00:25 2010
@@ -21,13 +21,12 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:osgi="http://www.springframework.org/schema/osgi"
- xmlns:camel-osgi="http://camel.apache.org/schema/osgi"
+ xmlns:camel="http://camel.apache.org/schema/spring"
xmlns:jaxws="http://cxf.apache.org/jaxws"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- http://camel.apache.org/schema/osgi http://camel.apache.org/schema/osgi/camel-osgi.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml" />
@@ -35,7 +34,7 @@
<import resource="classpath:META-INF/cxf/transport/nmr/cxf-transport-nmr.xml" />
<import resource="classpath:org/apache/servicemix/camel/nmr/camel-nmr.xml" />
- <camel-osgi:camelContext xmlns="http://camel.apache.org/schema/spring">
+ <camel:camelContext xmlns="http://camel.apache.org/schema/spring">
<!-- Route periodically sent events into the NMR -->
<route>
<from uri="timer://myTimer?fixedRate=true&period=5000&exchangePattern=InOut" />
@@ -43,7 +42,7 @@
<to uri="nmr:HelloWorld"/>
<bean ref="myTransform" method="display" />
</route>
- </camel-osgi:camelContext>
+ </camel:camelContext>
<bean id="myTransform" class="org.apache.servicemix.examples.cxfcamel.MyTransform">
<property name="value"><value><![CDATA[<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"><soap:Body><ns1:sayHi xmlns:ns1="http://cxfcamel.examples.servicemix.apache.org/"><arg0>Guillaume</arg0></ns1:sayHi></soap:Body></soap:Envelope>]]></value></property>