You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2012/05/21 10:33:35 UTC
svn commit: r1340930 - in /servicemix/smx4/features/trunk:
camel/servicemix-camel/
camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/
cxf/cxf-transport-nmr/ examples/cxf/cxf-jaxws-blueprint/
examples/cxf/cxf-ws-rm/ parent/
Author: ffang
Date: Mon May 21 08:33:35 2012
New Revision: 1340930
URL: http://svn.apache.org/viewvc?rev=1340930&view=rev
Log:
[SMX4-1135]Upgrade to CXF 2.6.0
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/MAPVerifier.java
servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml
servicemix/smx4/features/trunk/examples/cxf/cxf-jaxws-blueprint/pom.xml
servicemix/smx4/features/trunk/examples/cxf/cxf-ws-rm/pom.xml
servicemix/smx4/features/trunk/parent/pom.xml
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml?rev=1340930&r1=1340929&r2=1340930&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml Mon May 21 08:33:35 2012
@@ -34,6 +34,12 @@
<dependencies>
<dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ <version>2.5.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.nmr</groupId>
<artifactId>org.apache.servicemix.nmr.osgi</artifactId>
</dependency>
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/MAPVerifier.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/MAPVerifier.java?rev=1340930&r1=1340929&r2=1340930&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/MAPVerifier.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/MAPVerifier.java Mon May 21 08:33:35 2012
@@ -24,7 +24,8 @@ import java.util.Map;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
-import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
+import org.apache.cxf.ws.addressing.AddressingProperties;
+import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
import org.apache.cxf.ws.addressing.ContextUtils;
import org.apache.cxf.ws.addressing.Names;
@@ -61,7 +62,7 @@ public class MAPVerifier extends Abstrac
(String)mapProperties.get(isOutbound
? WSAddressingTest.OUTBOUND_KEY
: WSAddressingTest.INBOUND_KEY);
- AddressingPropertiesImpl maps =
+ AddressingProperties maps =
(AddressingPropertiesImpl)message.get(mapProperty);
if (ContextUtils.isRequestor(message)) {
if (isOutbound) {
Modified: servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml?rev=1340930&r1=1340929&r2=1340930&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml Mon May 21 08:33:35 2012
@@ -166,13 +166,6 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-utilities</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- </dependencies>
</plugin>
<!-- exclude generated class from Cobertura reports -->
<plugin>
Modified: servicemix/smx4/features/trunk/examples/cxf/cxf-jaxws-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-jaxws-blueprint/pom.xml?rev=1340930&r1=1340929&r2=1340930&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf/cxf-jaxws-blueprint/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf/cxf-jaxws-blueprint/pom.xml Mon May 21 08:33:35 2012
@@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-utilities</artifactId>
+ <artifactId>cxf-api</artifactId>
<version>${cxf.version}</version>
</dependency>
</dependencies>
Modified: servicemix/smx4/features/trunk/examples/cxf/cxf-ws-rm/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-ws-rm/pom.xml?rev=1340930&r1=1340929&r2=1340930&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf/cxf-ws-rm/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf/cxf-ws-rm/pom.xml Mon May 21 08:33:35 2012
@@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-utilities</artifactId>
+ <artifactId>cxf-api</artifactId>
</dependency>
</dependencies>
Modified: servicemix/smx4/features/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/parent/pom.xml?rev=1340930&r1=1340929&r2=1340930&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/parent/pom.xml (original)
+++ servicemix/smx4/features/trunk/parent/pom.xml Mon May 21 08:33:35 2012
@@ -39,7 +39,7 @@
<properties>
<activemq.version>5.5.1</activemq.version>
<camel.version>2.9.0</camel.version>
- <cxf.version>2.5.2</cxf.version>
+ <cxf.version>2.6.0</cxf.version>
<felix.obr.version>1.6.4</felix.obr.version>