Author: ningjiang
Date: Tue Nov 29 03:42:12 2011
New Revision: 1207743
URL: http://svn.apache.org/viewvc?rev=1207743&view=rev
Log:
CAMEL-4723 clean up the imports of cxf extension xml in the examples
Modified:
camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.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=1207743&r1=1207742&r2=1207743&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
Tue Nov 29 03:42:12 2011
@@ -26,8 +26,7 @@
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/osgi/cxf-extension-osgi.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-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=1207743&r1=1207742&r2=1207743&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
Tue Nov 29 03:42:12 2011
@@ -27,14 +27,9 @@
<!-- Needed Apache 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"/>
-
- <bean id="loggingOutInterceptor"
class="org.apache.cxf.interceptor.LoggingOutInterceptor">
- <!-- it really should have been user-prestream but CXF does have such
phase! -->
- <constructor-arg value="write"/>
- </bean>
+ <bean id="loggingOutInterceptor"
class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
+
<bean id="loggingInInterceptor"
class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
<bean id="wss4jInInterceptor"
class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
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=1207743&r1=1207742&r2=1207743&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
Tue Nov 29 03:42:12 2011
@@ -27,9 +27,7 @@
<!-- Needed Apache 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"/>
-
+
<cxf:cxfEndpoint id="reportIncident"
address="http://localhost:9080/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=1207743&r1=1207742&r2=1207743&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
Tue Nov 29 03:42:12 2011
@@ -24,8 +24,6 @@
<!-- needed Apache 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-servlet.xml"/>
<!-- create a camel context as to start Camel -->
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
