Author: ningjiang
Date: Tue Aug 9 06:55:40 2011
New Revision: 1155230
URL: http://svn.apache.org/viewvc?rev=1155230&view=rev
Log:
Clean up the camel context file of the example after upgrading to CXF 2.4.x
Modified:
camel/trunk/examples/camel-example-cxf-proxy/src/main/resources/META-INF/spring/camel-config.xml
camel/trunk/examples/camel-example-cxf-tomcat/src/main/resources/camel-config.xml
camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelCXFProviderRouteConfig.xml
camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelTransportSpringConfig.xml
camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/CxfRouteCamelContext.xml
camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/JAXRSCamelContext.xml
Modified:
camel/trunk/examples/camel-example-cxf-proxy/src/main/resources/META-INF/spring/camel-config.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-proxy/src/main/resources/META-INF/spring/camel-config.xml?rev=1155230&r1=1155229&r2=1155230&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cxf-proxy/src/main/resources/META-INF/spring/camel-config.xml
(original)
+++
camel/trunk/examples/camel-example-cxf-proxy/src/main/resources/META-INF/spring/camel-config.xml
Tue Aug 9 06:55:40 2011
@@ -26,11 +26,8 @@
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
http://camel.apache.org/schema/cxf
http://camel.apache.org/schema/cxf/camel-cxf.xsd";>
- <!-- needed cxf imports -->
<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"/>
-
+
<!-- use a bean to start and stop the real web service (is not Camel
specific) -->
<!-- in a real use-case the real web service would be located on another
server
but we simulate this in the same JVM -->
Modified:
camel/trunk/examples/camel-example-cxf-tomcat/src/main/resources/camel-config.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-tomcat/src/main/resources/camel-config.xml?rev=1155230&r1=1155229&r2=1155230&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cxf-tomcat/src/main/resources/camel-config.xml
(original)
+++
camel/trunk/examples/camel-example-cxf-tomcat/src/main/resources/camel-config.xml
Tue Aug 9 06:55:40 2011
@@ -27,9 +27,6 @@
http://camel.apache.org/schema/cxf
http://camel.apache.org/schema/cxf/camel-cxf.xsd";>
<import resource="classpath:META-INF/cxf/cxf.xml"/>
- <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>
- <!-- when running in Tomcat we use the CXF servlet -->
- <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<bean id="myRoutes" class="org.apache.camel.example.cxf.CamelRoute"/>
Modified:
camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelCXFProviderRouteConfig.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelCXFProviderRouteConfig.xml?rev=1155230&r1=1155229&r2=1155230&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelCXFProviderRouteConfig.xml
(original)
+++
camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelCXFProviderRouteConfig.xml
Tue Aug 9 06:55:40 2011
@@ -32,8 +32,6 @@
-->
<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"/>
<bean id="testBean"
class="org.apache.camel.example.cxf.provider.TesterBean"/>
Modified:
camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelTransportSpringConfig.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelTransportSpringConfig.xml?rev=1155230&r1=1155229&r2=1155230&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelTransportSpringConfig.xml
(original)
+++
camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelTransportSpringConfig.xml
Tue Aug 9 06:55:40 2011
@@ -23,8 +23,6 @@
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"/>
<bean id="roundRobinRef"
class="org.apache.camel.processor.loadbalancer.RoundRobinLoadBalancer"/>
Modified:
camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/CxfRouteCamelContext.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/CxfRouteCamelContext.xml?rev=1155230&r1=1155229&r2=1155230&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/CxfRouteCamelContext.xml
(original)
+++
camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/CxfRouteCamelContext.xml
Tue Aug 9 06:55:40 2011
@@ -28,9 +28,6 @@
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.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"/>
- <import resource="classpath:META-INF/cxf/cxf-extension-jms.xml"/>
<broker:broker id="broker" useJmx="false" persistent="false"
dataDirectory="target/activemq">
<broker:transportConnectors>
Modified:
camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/JAXRSCamelContext.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/JAXRSCamelContext.xml?rev=1155230&r1=1155229&r2=1155230&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/JAXRSCamelContext.xml
(original)
+++
camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/JAXRSCamelContext.xml
Tue Aug 9 06:55:40 2011
@@ -24,9 +24,6 @@
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"/>
- <import resource="classpath:META-INF/cxf/cxf-extension-jms.xml"/>
<camel:camelContext id="cxfrs_context">
<camel:package>org.apache.camel.example.cxf.jaxrs</camel:package>
