You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2012/04/05 19:10:02 UTC
svn commit: r1309950 - in /camel/branches/camel-2.9.x: ./
components/camel-cxf/
components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/
components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/
components/camel-cxf/src/...
Author: dkulp
Date: Thu Apr 5 17:10:02 2012
New Revision: 1309950
URL: http://svn.apache.org/viewvc?rev=1309950&view=rev
Log:
Pull some stuff back from trunk to allow testing 2.9.x with CXF 2.6.0-SNAPSHOT
Added:
camel/branches/camel-2.9.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointBeans-2.6.xml
- copied unchanged from r1305505, camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointBeans-2.6.xml
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-cxf/pom.xml
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Reverse-merged /camel/trunk:r1309945
Merged /camel/trunk:r1230710,1305505
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-blocked' - no diff available.
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/components/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/pom.xml?rev=1309950&r1=1309949&r2=1309950&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/pom.xml (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/pom.xml Thu Apr 5 17:10:02 2012
@@ -157,6 +157,11 @@
<version>${cxf-version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-soap</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -311,6 +316,26 @@
</build>
<profiles>
+ <profile>
+ <id>cxf-2.6</id>
+ <properties>
+ <cxf-version>2.6.0-SNAPSHOT</cxf-version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-extension-providers</artifactId>
+ <version>${cxf-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+ </profile>
<profile>
<id>fastinstall</id>
<properties>
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java?rev=1309950&r1=1309949&r2=1309950&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java Thu Apr 5 17:10:02 2012
@@ -20,6 +20,8 @@ import org.apache.camel.component.cxf.ja
import org.apache.camel.component.cxf.spring.SpringJAXRSClientFactoryBean;
import org.apache.camel.component.cxf.spring.SpringJAXRSServerFactoryBean;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.apache.cxf.version.Version;
+
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -57,7 +59,11 @@ public class CxfRsSpringEndpointTest ext
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext(new String("org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointBeans.xml"));
+ String version = Version.getCurrentVersion();
+ if (version.contains("2.5") || version.contains("2.4")) {
+ return new ClassPathXmlApplicationContext(new String("org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointBeans.xml"));
+ }
+ return new ClassPathXmlApplicationContext(new String("org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointBeans-2.6.xml"));
}
}
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java?rev=1309950&r1=1309949&r2=1309950&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java Thu Apr 5 17:10:02 2012
@@ -19,6 +19,7 @@ package org.apache.camel.component.cxf.s
import org.apache.camel.CamelContext;
import org.apache.camel.component.cxf.CXFTestSupport;
import org.apache.camel.component.cxf.CxfEndpoint;
+import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.junit.Test;
@@ -45,7 +46,12 @@ public class CxfEndpointBeanWithBusTest
// Spring 3.0.0 has an issue of SPR-6589 which will call the BusApplicationListener twice for the same event,
// so we will get more one InInterceptors here
assertTrue(endpoint.getBus().getInInterceptors().size() >= 1);
- assertEquals(LoggingInInterceptor.class, endpoint.getBus().getInInterceptors().get(0).getClass());
+ for (Interceptor<?> i : endpoint.getBus().getInInterceptors()) {
+ if (i instanceof LoggingInInterceptor) {
+ return;
+ }
+ }
+ fail("Could not find the LoggingInInterceptor on the bus. " + endpoint.getBus().getInInterceptors());
}
@Test