You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2011/12/04 15:58:37 UTC
svn commit: r1210121 - in /camel/branches/camel-2.7.x:
components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/
components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/multipart/
components/camel-dns/src/test/resource...
Author: cmueller
Date: Sun Dec 4 14:58:36 2011
New Revision: 1210121
URL: http://svn.apache.org/viewvc?rev=1210121&view=rev
Log:
CAMEL-4738: Remove the version numbers from Spring configuration files
Modified:
camel/branches/camel-2.7.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest-context.xml
camel/branches/camel-2.7.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest-context.xml
camel/branches/camel-2.7.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/multipart/MultiPartTest.xml
camel/branches/camel-2.7.x/components/camel-dns/src/test/resources/DNSDig.xml
camel/branches/camel-2.7.x/components/camel-dns/src/test/resources/DNSLookup.xml
camel/branches/camel-2.7.x/components/camel-dns/src/test/resources/IPCheck.xml
camel/branches/camel-2.7.x/components/camel-dns/src/test/resources/Wikipedia.xml
camel/branches/camel-2.7.x/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.xml
camel/branches/camel-2.7.x/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.xml
camel/branches/camel-2.7.x/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringDataSource.xml
camel/branches/camel-2.7.x/examples/camel-example-spring-javaconfig/src/main/resources/META-INF/spring/camel-context.xml
Modified: camel/branches/camel-2.7.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest-context.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest-context.xml?rev=1210121&r1=1210120&r2=1210121&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest-context.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest-context.xml Sun Dec 4 14:58:36 2011
@@ -18,35 +18,33 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:cxf="http://camel.apache.org/schema/cxf"
-
xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ ">
- <cxf:cxfEndpoint id="consumerEndpoint" address="http://localhost:9091/jaxws-mtom/hello"
- wsdlURL="mtom.wsdl"
- serviceName="ns:HelloService"
- endpointName="ns:HelloPort"
- xmlns:ns="http://apache.org/camel/cxf/mtom_feature">
+ <cxf:cxfEndpoint id="consumerEndpoint"
+ address="http://localhost:9091/jaxws-mtom/hello"
+ wsdlURL="mtom.wsdl"
+ serviceName="ns:HelloService"
+ endpointName="ns:HelloPort"
+ xmlns:ns="http://apache.org/camel/cxf/mtom_feature">
<cxf:properties>
<entry key="mtom-enabled" value="false"/>
<entry key="dataFormat" value="PAYLOAD"/>
<entry key="loggingFeatureEnabled" value="false"/>
</cxf:properties>
-
- </cxf:cxfEndpoint>
+ </cxf:cxfEndpoint>
- <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
- <route>
- <from uri="cxf:bean:consumerEndpoint" />
- <process ref="myProcessor" />
- </route>
- </camelContext>
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+ <route>
+ <from uri="cxf:bean:consumerEndpoint" />
+ <process ref="myProcessor" />
+ </route>
+ </camelContext>
- <bean id="myProcessor"
- class="org.apache.camel.component.cxf.mtom.CxfMtomDisabledConsumerPayloadModeTest$MyProcessor" />
+ <bean id="myProcessor" class="org.apache.camel.component.cxf.mtom.CxfMtomDisabledConsumerPayloadModeTest$MyProcessor" />
</beans>
Modified: camel/branches/camel-2.7.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest-context.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest-context.xml?rev=1210121&r1=1210120&r2=1210121&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest-context.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest-context.xml Sun Dec 4 14:58:36 2011
@@ -18,31 +18,31 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:cxf="http://camel.apache.org/schema/cxf"
-
xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ ">
- <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:9092/jaxws-mtom/hello"
- wsdlURL="mtom.wsdl"
- serviceName="ns:HelloService"
- endpointName="ns:HelloPort"
- xmlns:ns="http://apache.org/camel/cxf/mtom_feature">
+ <cxf:cxfEndpoint id="serviceEndpoint"
+ address="http://localhost:9092/jaxws-mtom/hello"
+ wsdlURL="mtom.wsdl"
+ serviceName="ns:HelloService"
+ endpointName="ns:HelloPort"
+ xmlns:ns="http://apache.org/camel/cxf/mtom_feature">
<cxf:properties>
<entry key="dataFormat" value="PAYLOAD"/>
<entry key="loggingFeatureEnabled" value="false"/>
</cxf:properties>
- </cxf:cxfEndpoint>
+ </cxf:cxfEndpoint>
- <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
- <route>
- <from uri="direct:testEndpoint" />
- <to uri="cxf:bean:serviceEndpoint" />
- </route>
- </camelContext>
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+ <route>
+ <from uri="direct:testEndpoint" />
+ <to uri="cxf:bean:serviceEndpoint" />
+ </route>
+ </camelContext>
</beans>
\ No newline at end of file
Modified: camel/branches/camel-2.7.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/multipart/MultiPartTest.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/multipart/MultiPartTest.xml?rev=1210121&r1=1210120&r2=1210121&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/multipart/MultiPartTest.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/multipart/MultiPartTest.xml Sun Dec 4 14:58:36 2011
@@ -18,38 +18,41 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:cxf="http://camel.apache.org/schema/cxf"
-
xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
- <import resource="classpath:META-INF/cxf/cxf.xml"/>
- <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
- <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ ">
+ <import resource="classpath:META-INF/cxf/cxf.xml"/>
+ <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
- <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:9003/CamelContext/RouterPort"
- wsdlURL="classpath:/MultiPartTest.wsdl" endpointName="s:MultiPartInvokePort"
- serviceName="s:MultiPartInvokeService"
+ <cxf:cxfEndpoint id="routerEndpoint"
+ address="http://localhost:9003/CamelContext/RouterPort"
+ wsdlURL="classpath:/MultiPartTest.wsdl"
+ endpointName="s:MultiPartInvokePort"
+ serviceName="s:MultiPartInvokeService"
xmlns:s="http://camel.apache.org/cxf/multipart">
+
<cxf:outInterceptors>
<bean class="org.apache.camel.component.cxf.WriteXmlDeclarationInterceptor"/>
</cxf:outInterceptors>
</cxf:cxfEndpoint>
- <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:9000/SoapContext/SoapPort"
- wsdlURL="classpath:MultiPartTest.wsdl"
- endpointName="s:MultiPartInvokePort"
- serviceName="s:MultiPartInvokeService"
+ <cxf:cxfEndpoint id="serviceEndpoint"
+ address="http://localhost:9000/SoapContext/SoapPort"
+ wsdlURL="classpath:MultiPartTest.wsdl"
+ endpointName="s:MultiPartInvokePort"
+ serviceName="s:MultiPartInvokeService"
xmlns:s="http://camel.apache.org/cxf/multipart" />
- <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
- <route errorHandlerRef="noErrorHandler">
- <from uri="cxf:bean:routerEndpoint?dataFormat=PAYLOAD" />
- <to uri="cxf:bean:serviceEndpoint?dataFormat=PAYLOAD" />
- </route>
- </camelContext>
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+ <route errorHandlerRef="noErrorHandler">
+ <from uri="cxf:bean:routerEndpoint?dataFormat=PAYLOAD" />
+ <to uri="cxf:bean:serviceEndpoint?dataFormat=PAYLOAD" />
+ </route>
+ </camelContext>
- <bean id="noErrorHandler" class="org.apache.camel.builder.NoErrorHandlerBuilder"/>
+ <bean id="noErrorHandler" class="org.apache.camel.builder.NoErrorHandlerBuilder"/>
</beans>
Modified: camel/branches/camel-2.7.x/components/camel-dns/src/test/resources/DNSDig.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-dns/src/test/resources/DNSDig.xml?rev=1210121&r1=1210120&r2=1210121&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-dns/src/test/resources/DNSDig.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-dns/src/test/resources/DNSDig.xml Sun Dec 4 14:58:36 2011
@@ -21,12 +21,8 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:camel="http://camel.apache.org/schema/spring"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://camel.apache.org/schema/spring
- http://camel.apache.org/schema/spring/camel-spring.xsd">
-
-
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<camelContext id="camel" trace="true" xmlns="http://camel.apache.org/schema/spring">
<route id="IPCheck">
Modified: camel/branches/camel-2.7.x/components/camel-dns/src/test/resources/DNSLookup.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-dns/src/test/resources/DNSLookup.xml?rev=1210121&r1=1210120&r2=1210121&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-dns/src/test/resources/DNSLookup.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-dns/src/test/resources/DNSLookup.xml Sun Dec 4 14:58:36 2011
@@ -21,12 +21,8 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:camel="http://camel.apache.org/schema/spring"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://camel.apache.org/schema/spring
- http://camel.apache.org/schema/spring/camel-spring.xsd">
-
-
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<camelContext id="camel" trace="true" xmlns="http://camel.apache.org/schema/spring">
<route id="IPCheck">
Modified: camel/branches/camel-2.7.x/components/camel-dns/src/test/resources/IPCheck.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-dns/src/test/resources/IPCheck.xml?rev=1210121&r1=1210120&r2=1210121&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-dns/src/test/resources/IPCheck.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-dns/src/test/resources/IPCheck.xml Sun Dec 4 14:58:36 2011
@@ -21,12 +21,8 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:camel="http://camel.apache.org/schema/spring"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://camel.apache.org/schema/spring
- http://camel.apache.org/schema/spring/camel-spring.xsd">
-
-
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<camelContext id="camel" trace="true" xmlns="http://camel.apache.org/schema/spring">
<route id="IPCheck">
Modified: camel/branches/camel-2.7.x/components/camel-dns/src/test/resources/Wikipedia.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-dns/src/test/resources/Wikipedia.xml?rev=1210121&r1=1210120&r2=1210121&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-dns/src/test/resources/Wikipedia.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-dns/src/test/resources/Wikipedia.xml Sun Dec 4 14:58:36 2011
@@ -21,12 +21,8 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:camel="http://camel.apache.org/schema/spring"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://camel.apache.org/schema/spring
- http://camel.apache.org/schema/spring/camel-spring.xsd">
-
-
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<camelContext id="camel" trace="true" xmlns="http://camel.apache.org/schema/spring">
<route id="IPCheck">
Modified: camel/branches/camel-2.7.x/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.xml?rev=1210121&r1=1210120&r2=1210121&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateRecoverWithRedeliveryPolicyTest.xml Sun Dec 4 14:58:36 2011
@@ -21,10 +21,10 @@
xmlns:util="http://www.springframework.org/schema/util"
xmlns:jdbc="http://www.springframework.org/schema/jdbc"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
- http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+ http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<import resource="JdbcSpringDataSource.xml" />
Modified: camel/branches/camel-2.7.x/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.xml?rev=1210121&r1=1210120&r2=1210121&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringAggregateTest.xml Sun Dec 4 14:58:36 2011
@@ -21,10 +21,10 @@
xmlns:util="http://www.springframework.org/schema/util"
xmlns:jdbc="http://www.springframework.org/schema/jdbc"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
- http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+ http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<import resource="JdbcSpringDataSource.xml" />
Modified: camel/branches/camel-2.7.x/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringDataSource.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringDataSource.xml?rev=1210121&r1=1210120&r2=1210121&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringDataSource.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringDataSource.xml Sun Dec 4 14:58:36 2011
@@ -23,14 +23,14 @@
xmlns:tx="http://www.springframework.org/schema/tx"
xmlns:aop="http://www.springframework.org/schema/aop"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
- http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
- http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
- http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+ http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd">
<tx:annotation-driven transaction-manager="txManager"/>
Modified: camel/branches/camel-2.7.x/examples/camel-example-spring-javaconfig/src/main/resources/META-INF/spring/camel-context.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/examples/camel-example-spring-javaconfig/src/main/resources/META-INF/spring/camel-context.xml?rev=1210121&r1=1210120&r2=1210121&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/examples/camel-example-spring-javaconfig/src/main/resources/META-INF/spring/camel-context.xml (original)
+++ camel/branches/camel-2.7.x/examples/camel-example-spring-javaconfig/src/main/resources/META-INF/spring/camel-context.xml Sun Dec 4 14:58:36 2011
@@ -21,9 +21,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<!-- first, define your individual @Configuration classes as beans -->
<bean class="org.apache.camel.example.spring.javaconfig.MyRouteConfig"/>
@@ -32,5 +31,4 @@
<context:annotation-config/>
<!-- END SNIPPET: ex -->
-
</beans>