You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/01/26 11:41:00 UTC
svn commit: r1438875 - in /camel/trunk/examples:
camel-example-cxf-osgi/src/main/resources/META-INF/spring/
camel-example-cxf-proxy/src/main/resources/META-INF/spring/
camel-example-cxf-tomcat/src/main/resources/
camel-example-cxf/src/main/resources/ME...
Author: davsclaus
Date: Sat Jan 26 10:40:59 2013
New Revision: 1438875
URL: http://svn.apache.org/viewvc?rev=1438875&view=rev
Log:
Removed no longer needed cxf import in xml files
Modified:
camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
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/HttpToJmsCamelContext.xml
camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/JAXRSCamelContext.xml
camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/webServiceCamelContext.xml
camel/trunk/examples/camel-example-reportincident-wssecurity/src/main/resources/META-INF/spring/camel-context.xml
camel/trunk/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml
camel/trunk/examples/camel-example-reportincident/src/main/resources/camel-config.xml
Modified: camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml?rev=1438875&r1=1438874&r2=1438875&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml (original)
+++ camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml Sat Jan 26 10:40:59 2013
@@ -25,8 +25,6 @@
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">
- <import resource="classpath:META-INF/cxf/cxf.xml"/>
-
<cxf:cxfEndpoint id="reportIncident"
address="/camel-example-cxf-osgi/webservices/incident"
wsdlURL="META-INF/wsdl/report_incident.wsdl"
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=1438875&r1=1438874&r2=1438875&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 Sat Jan 26 10:40:59 2013
@@ -28,8 +28,6 @@
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">
- <import resource="classpath:META-INF/cxf/cxf.xml"/>
-
<!-- spring property placeholder, ignore resource not found as the file resource is for unit testing -->
<context:property-placeholder location="classpath:incident.properties,file:target/custom.properties"
ignore-resource-not-found="true"/>
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=1438875&r1=1438874&r2=1438875&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 Sat Jan 26 10:40:59 2013
@@ -26,8 +26,6 @@
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">
- <import resource="classpath:META-INF/cxf/cxf.xml"/>
-
<bean id="myRoutes" class="org.apache.camel.example.cxf.CamelRoute"/>
<camelContext xmlns="http://camel.apache.org/schema/spring">
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=1438875&r1=1438874&r2=1438875&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 Sat Jan 26 10:40:59 2013
@@ -36,8 +36,6 @@
please replace the cxf-extension-http-jetty.xml with cxf-servlet.xml
-->
- <import resource="classpath:META-INF/cxf/cxf.xml"/>
-
<bean id="testBean" class="org.apache.camel.example.cxf.provider.TesterBean"/>
<cxf:cxfEndpoint id="soapMessageEndpoint"
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=1438875&r1=1438874&r2=1438875&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 Sat Jan 26 10:40:59 2013
@@ -26,8 +26,6 @@
to dynamically set the port number for unit testing the example. -->
<bean id="bridgePropertyPlaceholder" class="org.apache.camel.spring.spi.BridgePropertyPlaceholderConfigurer"/>
- <import resource="classpath:META-INF/cxf/cxf.xml"/>
-
<bean id="roundRobinRef" class="org.apache.camel.processor.loadbalancer.RoundRobinLoadBalancer"/>
<bean class="org.apache.camel.component.cxf.transport.CamelTransportFactory" lazy-init="false">
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=1438875&r1=1438874&r2=1438875&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 Sat Jan 26 10:40:59 2013
@@ -27,8 +27,6 @@
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.5.0.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
- <import resource="classpath:META-INF/cxf/cxf.xml"/>
-
<broker:broker id="broker" useJmx="false" persistent="false" dataDirectory="target/activemq">
<broker:transportConnectors>
<broker:transportConnector name="openwire" uri="vm://localhost"/>
@@ -45,5 +43,4 @@
implementor="org.apache.camel.example.cxf.GreeterImpl"
address="jms://"/>
-
</beans>
\ No newline at end of file
Modified: camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/HttpToJmsCamelContext.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/HttpToJmsCamelContext.xml?rev=1438875&r1=1438874&r2=1438875&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/HttpToJmsCamelContext.xml (original)
+++ camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/HttpToJmsCamelContext.xml Sat Jan 26 10:40:59 2013
@@ -31,8 +31,6 @@
to dynamically set the port number for unit testing the example. -->
<bean id="bridgePropertyPlaceholder" class="org.apache.camel.spring.spi.BridgePropertyPlaceholderConfigurer"/>
- <import resource="classpath:META-INF/cxf/cxf.xml"/>
-
<broker:broker id="broker" useJmx="false" persistent="false" dataDirectory="target/activemq">
<broker:transportConnectors>
<broker:transportConnector name="openwire" uri="vm://localhost"/>
@@ -49,5 +47,4 @@
implementor="org.apache.camel.example.cxf.httptojms.GreeterImpl"
address="jms://"/>
-
</beans>
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=1438875&r1=1438874&r2=1438875&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 Sat Jan 26 10:40:59 2013
@@ -27,8 +27,6 @@
to dynamically set the port number for unit testing the example. -->
<bean id="bridgePropertyPlaceholder" class="org.apache.camel.spring.spi.BridgePropertyPlaceholderConfigurer"/>
- <import resource="classpath:META-INF/cxf/cxf.xml"/>
-
<camel:camelContext id="cxfrs_context">
<camel:package>org.apache.camel.example.cxf.jaxrs</camel:package>
</camel:camelContext>
Modified: camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/webServiceCamelContext.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/webServiceCamelContext.xml?rev=1438875&r1=1438874&r2=1438875&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/webServiceCamelContext.xml (original)
+++ camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/webServiceCamelContext.xml Sat Jan 26 10:40:59 2013
@@ -29,8 +29,6 @@
http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
- <import resource="classpath:META-INF/cxf/cxf.xml"/>
-
<!-- spring property placeholder, ignore resource not found as the file resource is for unit testing -->
<context:property-placeholder location="classpath:loanbroker.properties,file:target/custom.properties"
ignore-resource-not-found="true"/>
Modified: camel/trunk/examples/camel-example-reportincident-wssecurity/src/main/resources/META-INF/spring/camel-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident-wssecurity/src/main/resources/META-INF/spring/camel-context.xml?rev=1438875&r1=1438874&r2=1438875&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-reportincident-wssecurity/src/main/resources/META-INF/spring/camel-context.xml (original)
+++ camel/trunk/examples/camel-example-reportincident-wssecurity/src/main/resources/META-INF/spring/camel-context.xml Sat Jan 26 10:40:59 2013
@@ -25,9 +25,6 @@
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 Apache CXF imports -->
- <import resource="classpath:META-INF/cxf/cxf.xml"/>
-
<bean id="loggingOutInterceptor" class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
<bean id="loggingInInterceptor" class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
Modified: camel/trunk/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml?rev=1438875&r1=1438874&r2=1438875&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml (original)
+++ camel/trunk/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml Sat Jan 26 10:40:59 2013
@@ -28,9 +28,6 @@
<!-- this is Spring XML example of the Camel route in the ReportIncidentRoutes class -->
<!-- this is for demonstration purpose, to show how you can use Camel with XML DSL -->
- <!-- Needed Apache CXF imports -->
- <import resource="classpath:META-INF/cxf/cxf.xml"/>
-
<cxf:cxfEndpoint id="reportIncident"
address="http://localhost:{{port}}/camel-example-reportincident/webservices/incident"
wsdlURL="etc/report_incident.wsdl"
Modified: camel/trunk/examples/camel-example-reportincident/src/main/resources/camel-config.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident/src/main/resources/camel-config.xml?rev=1438875&r1=1438874&r2=1438875&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-reportincident/src/main/resources/camel-config.xml (original)
+++ camel/trunk/examples/camel-example-reportincident/src/main/resources/camel-config.xml Sat Jan 26 10:40:59 2013
@@ -22,9 +22,6 @@
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">
- <!-- needed Apache CXF imports -->
- <import resource="classpath:META-INF/cxf/cxf.xml"/>
-
<!-- create a camel context as to start Camel -->
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
<package>org.apache.camel.example.reportincident</package>