You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2011/06/22 11:13:32 UTC
svn commit: r1138350 - in /camel/trunk/examples/camel-example-cxf-osgi:
pom.xml src/main/resources/META-INF/spring/camel-context.xml
Author: ningjiang
Date: Wed Jun 22 09:13:32 2011
New Revision: 1138350
URL: http://svn.apache.org/viewvc?rev=1138350&view=rev
Log:
CAMEL-4138 Fixed the issue that camel-example-cxf-osgi can't be deployed with CXF 2.4.x
Modified:
camel/trunk/examples/camel-example-cxf-osgi/pom.xml
camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
Modified: camel/trunk/examples/camel-example-cxf-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-osgi/pom.xml?rev=1138350&r1=1138349&r2=1138350&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-osgi/pom.xml (original)
+++ camel/trunk/examples/camel-example-cxf-osgi/pom.xml Wed Jun 22 09:13:32 2011
@@ -23,8 +23,8 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>examples</artifactId>
- <version>2.8-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <version>2.8-SNAPSHOT</version>
+ <relativePath>..</relativePath>
</parent>
<artifactId>camel-example-cxf-osgi</artifactId>
@@ -124,7 +124,6 @@
org.apache.cxf.transport.http,
org.apache.cxf.transport.http.policy,
org.apache.cxf.transport.http_jetty,
- org.apache.cxf.transport.http_osgi,
org.apache.cxf.transport.jms,
org.apache.cxf.transports.http,
org.apache.cxf.workqueue,
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=1138350&r1=1138349&r2=1138350&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 Wed Jun 22 09:13:32 2011
@@ -24,10 +24,9 @@
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
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"/>
- <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>
- <import resource="classpath:META-INF/cxf/cxf-extension-http.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"