camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1097682 - in /camel/trunk/examples: camel-example-cxf/src/main/resources/META-INF/spring/JAXRSCamelContext.xml camel-example-reportincident-ws-security-osgi/pom.xml
Date Fri, 29 Apr 2011 04:27:27 GMT
Author: ningjiang
Date: Fri Apr 29 04:27:27 2011
New Revision: 1097682

URL: http://svn.apache.org/viewvc?rev=1097682&view=rev
Log:
CAMEL-3879 Fixed example errors which are running with CXF 2.4.0

Modified:
    camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/JAXRSCamelContext.xml
    camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml

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=1097682&r1=1097681&r2=1097682&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
Fri Apr 29 04:27:27 2011
@@ -26,7 +26,6 @@
   <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" />
-  <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
   <import resource="classpath:META-INF/cxf/cxf-extension-jms.xml" />
 
   <camel:camelContext id="cxfrs_context">

Modified: camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml?rev=1097682&r1=1097681&r2=1097682&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml (original)
+++ camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml Fri Apr 29
04:27:27 2011
@@ -106,11 +106,6 @@
 		
 		<!-- ws-security -->
 		<dependency>
-		    <groupId>org.apache.ws.security</groupId>
-		    <artifactId>wss4j</artifactId>
-		    <version>1.5.8</version>
-		</dependency>
-		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-ws-security</artifactId>
 			<version>${cxf-version}</version>



Mime
View raw message