Author: ningjiang
Date: Tue Nov 29 06:38:12 2011
New Revision: 1207766
URL: http://svn.apache.org/viewvc?rev=1207766&view=rev
Log:
Merged revisions 1207743 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1207743 | ningjiang | 2011-11-29 11:42:12 +0800 (Tue, 29 Nov 2011) | 1 line
CAMEL-4723 clean up the imports of cxf extension xml in the examples
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/src/main/resources/META-INF/spring/camel-context.xml
camel/branches/camel-2.8.x/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml
camel/branches/camel-2.8.x/examples/camel-example-reportincident/src/main/resources/camel-config.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 29 06:38:12 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414
+/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml?rev=1207766&r1=1207765&r2=1207766&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
(original)
+++
camel/branches/camel-2.8.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
Tue Nov 29 06:38:12 2011
@@ -26,8 +26,6 @@
http://camel.apache.org/schema/cxf
http://camel.apache.org/schema/cxf/camel-cxf.xsd";>
<!--Create a new SpringBus -->
<import resource="classpath:META-INF/cxf/cxf.xml"/>
- <!--Make sure the OSGi servlet transport is regirsted with the bus -->
- <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
<cxf:cxfEndpoint id="reportIncident"
address="/camel-example-cxf-osgi/webservices/incident"
Modified:
camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/src/main/resources/META-INF/spring/camel-context.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/src/main/resources/META-INF/spring/camel-context.xml?rev=1207766&r1=1207765&r2=1207766&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/src/main/resources/META-INF/spring/camel-context.xml
(original)
+++
camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/src/main/resources/META-INF/spring/camel-context.xml
Tue Nov 29 06:38:12 2011
@@ -25,15 +25,11 @@
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"/>
- <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/branches/camel-2.8.x/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml?rev=1207766&r1=1207765&r2=1207766&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml
(original)
+++
camel/branches/camel-2.8.x/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml
Tue Nov 29 06:38:12 2011
@@ -25,10 +25,9 @@
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"/>
- <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/branches/camel-2.8.x/examples/camel-example-reportincident/src/main/resources/camel-config.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-reportincident/src/main/resources/camel-config.xml?rev=1207766&r1=1207765&r2=1207766&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/examples/camel-example-reportincident/src/main/resources/camel-config.xml
(original)
+++
camel/branches/camel-2.8.x/examples/camel-example-reportincident/src/main/resources/camel-config.xml
Tue Nov 29 06:38:12 2011
@@ -21,13 +21,12 @@
xsi:schemaLocation="
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";>
- <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";>
- <package>org.apache.camel.example.reportincident</package>
- </camelContext>
+ <!-- needed Apache CXF imports -->
+ <import resource="classpath:META-INF/cxf/cxf.xml"/>
-</beans>
\ No newline at end of file
+ <!-- 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>
+ </camelContext>
+
+</beans>
