Author: cmueller
Date: Sun Apr 14 20:32:30 2013
New Revision: 1467826
URL: http://svn.apache.org/r1467826
Log:
CAMEL-6257: CXF Example OSGi fail in Karaf
Thanks Krzysztof Sobkowiak for reporting and the suggested solution
Modified:
camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/pom.xml
camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
Modified: camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/pom.xml?rev=1467826&r1=1467825&r2=1467826&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/pom.xml
(original)
+++ camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/pom.xml Sun Apr
14 20:32:30 2013
@@ -115,7 +115,6 @@
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Export-Package>org.apache.camel.example.reportincident*</Export-Package>
<Import-Package>
- META-INF.cxf,
org.apache.cxf,
org.apache.cxf.binding,
org.apache.cxf.binding.corba,
Modified:
camel/branches/camel-2.10.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.10.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml?rev=1467826&r1=1467825&r2=1467826&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
(original)
+++
camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
Sun Apr 14 20:32:30 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"