You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cs...@apache.org on 2011/06/16 16:04:31 UTC
svn commit: r1136441 - in /camel/trunk/components/camel-cxf/src:
main/java/org/apache/camel/component/cxf/converter/
main/java/org/apache/camel/component/cxf/jaxrs/
main/java/org/apache/camel/component/cxf/spring/
test/java/org/apache/camel/component/c...
Author: cschneider
Date: Thu Jun 16 14:04:31 2011
New Revision: 1136441
URL: http://svn.apache.org/viewvc?rev=1136441&view=rev
Log:
Moving the Bean classes to top level as they are used outside the parser classes and have no strong connection to the parsers
Added:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfSpringEndpointBean.java (with props)
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java (with props)
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSServerFactoryBean.java (with props)
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanTest.java
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java?rev=1136441&r1=1136440&r2=1136441&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java Thu Jun 16 14:04:31 2011
@@ -35,7 +35,7 @@ import org.apache.camel.TypeConverter;
import org.apache.camel.component.cxf.CxfEndpoint;
import org.apache.camel.component.cxf.CxfSpringEndpoint;
import org.apache.camel.component.cxf.DataFormat;
-import org.apache.camel.component.cxf.spring.CxfEndpointBeanDefinitionParser.CxfSpringEndpointBean;
+import org.apache.camel.component.cxf.spring.CxfSpringEndpointBean;
import org.apache.camel.spi.TypeConverterRegistry;
import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.util.EndpointHelper;
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java?rev=1136441&r1=1136440&r2=1136441&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java Thu Jun 16 14:04:31 2011
@@ -26,8 +26,8 @@ import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.component.cxf.spring.CxfRsClientFactoryBeanDefinitionParser.SpringJAXRSClientFactoryBean;
-import org.apache.camel.component.cxf.spring.CxfRsServerFactoryBeanDefinitionParser.SpringJAXRSServerFactoryBean;
+import org.apache.camel.component.cxf.spring.SpringJAXRSClientFactoryBean;
+import org.apache.camel.component.cxf.spring.SpringJAXRSServerFactoryBean;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategyAware;
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java?rev=1136441&r1=1136440&r2=1136441&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java Thu Jun 16 14:04:31 2011
@@ -21,16 +21,9 @@ import java.util.Map;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
-import org.apache.cxf.version.Version;
-import org.springframework.beans.BeansException;
+
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
public class CxfEndpointBeanDefinitionParser extends AbstractCxfBeanDefinitionParser {
@@ -72,39 +65,5 @@ public class CxfEndpointBeanDefinitionPa
setFirstChildAsProperty(el, ctx, bean, name);
}
}
-
- // To make the CxfEndpointBean clear without touching any Spring relates class
- // , we implements the ApplicationContextAware here
- public static class CxfSpringEndpointBean extends CxfEndpointBean implements ApplicationContextAware {
- private ApplicationContext applicationContext;
-
- public CxfSpringEndpointBean() {
- super();
- }
-
- public CxfSpringEndpointBean(ReflectionServiceFactoryBean factory) {
- super(factory);
- }
-
- @SuppressWarnings("deprecation")
- public void setApplicationContext(ApplicationContext ctx) throws BeansException {
- applicationContext = ctx;
- if (bus == null) {
- if (Version.getCurrentVersion().startsWith("2.3")) {
- // Don't relate on the DefaultBus
- BusFactory factory = new SpringBusFactory(ctx);
- bus = factory.createBus();
- BusWiringBeanFactoryPostProcessor.updateBusReferencesInContext(bus, ctx);
- } else {
- bus = BusWiringBeanFactoryPostProcessor.addDefaultBus(ctx);
- }
- }
- }
-
- public ApplicationContext getApplicationContext() {
- return applicationContext;
- }
-
- }
}
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java?rev=1136441&r1=1136440&r2=1136441&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java Thu Jun 16 14:04:31 2011
@@ -19,19 +19,10 @@ package org.apache.camel.component.cxf.s
import java.util.List;
import java.util.Map;
import org.w3c.dom.Element;
-import org.apache.camel.component.cxf.jaxrs.BeanIdAware;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
import org.apache.cxf.jaxrs.model.UserResource;
import org.apache.cxf.jaxrs.utils.ResourceUtils;
-import org.apache.cxf.version.Version;
-import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
public class CxfRsClientFactoryBeanDefinitionParser extends AbstractCxfBeanDefinitionParser {
@@ -67,42 +58,5 @@ public class CxfRsClientFactoryBeanDefin
} else {
setFirstChildAsProperty(el, ctx, bean, name);
}
- }
-
- public static class SpringJAXRSClientFactoryBean extends JAXRSClientFactoryBean
- implements ApplicationContextAware, BeanIdAware {
- private String beanId;
-
- public SpringJAXRSClientFactoryBean() {
- super();
- }
-
- @SuppressWarnings("deprecation")
- public void setApplicationContext(ApplicationContext ctx) throws BeansException {
- if (bus == null) {
- if (Version.getCurrentVersion().startsWith("2.3")) {
- // Don't relate on the DefaultBus
- BusFactory factory = new SpringBusFactory(ctx);
- bus = factory.createBus();
- BusWiringBeanFactoryPostProcessor.updateBusReferencesInContext(bus, ctx);
- setBus(bus);
- } else {
- setBus(BusWiringBeanFactoryPostProcessor.addDefaultBus(ctx));
- }
- }
- }
-
- public String getBeanId() {
- return beanId;
- }
-
- public void setBeanId(String id) {
- beanId = id;
- }
-
- // add this mothod for testing
- List<String> getSchemaLocations() {
- return schemaLocations;
- }
}
}
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java?rev=1136441&r1=1136440&r2=1136441&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java Thu Jun 16 14:04:31 2011
@@ -19,20 +19,10 @@ package org.apache.camel.component.cxf.s
import java.util.List;
import java.util.Map;
import org.w3c.dom.Element;
-import org.apache.camel.component.cxf.jaxrs.BeanIdAware;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
-import org.apache.cxf.jaxrs.JAXRSServiceFactoryBean;
import org.apache.cxf.jaxrs.model.UserResource;
import org.apache.cxf.jaxrs.utils.ResourceUtils;
-import org.apache.cxf.version.Version;
-import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
public class CxfRsServerFactoryBeanDefinitionParser extends AbstractCxfBeanDefinitionParser {
@@ -77,52 +67,6 @@ public class CxfRsServerFactoryBeanDefin
setFirstChildAsProperty(el, ctx, bean, name);
}
}
-
- public static class SpringJAXRSServerFactoryBean extends JAXRSServerFactoryBean implements
- ApplicationContextAware, BeanIdAware {
- private String beanId;
-
- public SpringJAXRSServerFactoryBean() {
- super();
- }
-
- public SpringJAXRSServerFactoryBean(JAXRSServiceFactoryBean sf) {
- super(sf);
- }
-
- @SuppressWarnings("deprecation")
- public void setApplicationContext(ApplicationContext ctx) throws BeansException {
- if (bus == null) {
- if (Version.getCurrentVersion().startsWith("2.3")) {
- // Don't relate on the DefaultBus
- BusFactory factory = new SpringBusFactory(ctx);
- bus = factory.createBus();
- setBus(bus);
- BusWiringBeanFactoryPostProcessor.updateBusReferencesInContext(bus, ctx);
- } else {
- setBus(BusWiringBeanFactoryPostProcessor.addDefaultBus(ctx));
- }
- }
- }
-
- public String getBeanId() {
- return beanId;
- }
-
- public void setBeanId(String id) {
- beanId = id;
- }
-
- // to walk round the issue of setting the serviceClass in CXF
- public void setServiceClass(Class clazz) {
- setResourceClasses(clazz);
- }
-
- // add this mothod for testing
- List<String> getSchemaLocations() {
- return schemaLocations;
- }
- }
}
Added: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfSpringEndpointBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfSpringEndpointBean.java?rev=1136441&view=auto
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfSpringEndpointBean.java (added)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfSpringEndpointBean.java Thu Jun 16 14:04:31 2011
@@ -0,0 +1,42 @@
+package org.apache.camel.component.cxf.spring;
+
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
+import org.apache.cxf.version.Version;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+public class CxfSpringEndpointBean extends CxfEndpointBean implements ApplicationContextAware {
+ private ApplicationContext applicationContext;
+
+ public CxfSpringEndpointBean() {
+ super();
+ }
+
+ public CxfSpringEndpointBean(ReflectionServiceFactoryBean factory) {
+ super(factory);
+ }
+
+ @SuppressWarnings("deprecation")
+ public void setApplicationContext(ApplicationContext ctx) throws BeansException {
+ applicationContext = ctx;
+ if (bus == null) {
+ if (Version.getCurrentVersion().startsWith("2.3")) {
+ // Don't relate on the DefaultBus
+ BusFactory factory = new SpringBusFactory(ctx);
+ bus = factory.createBus();
+ BusWiringBeanFactoryPostProcessor.updateBusReferencesInContext(bus, ctx);
+ } else {
+ bus = BusWiringBeanFactoryPostProcessor.addDefaultBus(ctx);
+ }
+ }
+ }
+
+ public ApplicationContext getApplicationContext() {
+ return applicationContext;
+ }
+
+}
\ No newline at end of file
Propchange: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfSpringEndpointBean.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java?rev=1136441&view=auto
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java (added)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java Thu Jun 16 14:04:31 2011
@@ -0,0 +1,51 @@
+package org.apache.camel.component.cxf.spring;
+
+import java.util.List;
+
+import org.apache.camel.component.cxf.jaxrs.BeanIdAware;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
+import org.apache.cxf.version.Version;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+public class SpringJAXRSClientFactoryBean extends JAXRSClientFactoryBean
+ implements ApplicationContextAware, BeanIdAware {
+ private String beanId;
+
+ public SpringJAXRSClientFactoryBean() {
+ super();
+ }
+
+ @SuppressWarnings("deprecation")
+ @Override
+ public void setApplicationContext(ApplicationContext ctx) throws BeansException {
+ if (bus == null) {
+ if (Version.getCurrentVersion().startsWith("2.3")) {
+ // Don't relate on the DefaultBus
+ BusFactory factory = new SpringBusFactory(ctx);
+ bus = factory.createBus();
+ BusWiringBeanFactoryPostProcessor.updateBusReferencesInContext(bus, ctx);
+ setBus(bus);
+ } else {
+ setBus(BusWiringBeanFactoryPostProcessor.addDefaultBus(ctx));
+ }
+ }
+ }
+
+ public String getBeanId() {
+ return beanId;
+ }
+
+ public void setBeanId(String id) {
+ beanId = id;
+ }
+
+ // add this mothod for testing
+ List<String> getSchemaLocations() {
+ return schemaLocations;
+ }
+}
\ No newline at end of file
Propchange: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSServerFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSServerFactoryBean.java?rev=1136441&view=auto
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSServerFactoryBean.java (added)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSServerFactoryBean.java Thu Jun 16 14:04:31 2011
@@ -0,0 +1,60 @@
+package org.apache.camel.component.cxf.spring;
+
+import java.util.List;
+
+import org.apache.camel.component.cxf.jaxrs.BeanIdAware;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
+import org.apache.cxf.jaxrs.JAXRSServiceFactoryBean;
+import org.apache.cxf.version.Version;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+public class SpringJAXRSServerFactoryBean extends JAXRSServerFactoryBean implements
+ ApplicationContextAware, BeanIdAware {
+ private String beanId;
+
+ public SpringJAXRSServerFactoryBean() {
+ super();
+ }
+
+ public SpringJAXRSServerFactoryBean(JAXRSServiceFactoryBean sf) {
+ super(sf);
+ }
+
+ @SuppressWarnings("deprecation")
+ public void setApplicationContext(ApplicationContext ctx) throws BeansException {
+ if (bus == null) {
+ if (Version.getCurrentVersion().startsWith("2.3")) {
+ // Don't relate on the DefaultBus
+ BusFactory factory = new SpringBusFactory(ctx);
+ bus = factory.createBus();
+ setBus(bus);
+ BusWiringBeanFactoryPostProcessor.updateBusReferencesInContext(bus, ctx);
+ } else {
+ setBus(BusWiringBeanFactoryPostProcessor.addDefaultBus(ctx));
+ }
+ }
+ }
+
+ public String getBeanId() {
+ return beanId;
+ }
+
+ public void setBeanId(String id) {
+ beanId = id;
+ }
+
+ // to walk round the issue of setting the serviceClass in CXF
+ public void setServiceClass(Class clazz) {
+ setResourceClasses(clazz);
+ }
+
+ // add this mothod for testing
+ List<String> getSchemaLocations() {
+ return schemaLocations;
+ }
+}
\ No newline at end of file
Propchange: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSServerFactoryBean.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java?rev=1136441&r1=1136440&r2=1136441&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java Thu Jun 16 14:04:31 2011
@@ -17,8 +17,8 @@
package org.apache.camel.component.cxf.jaxrs;
import org.apache.camel.component.cxf.jaxrs.testbean.CustomerService;
-import org.apache.camel.component.cxf.spring.CxfRsClientFactoryBeanDefinitionParser.SpringJAXRSClientFactoryBean;
-import org.apache.camel.component.cxf.spring.CxfRsServerFactoryBeanDefinitionParser.SpringJAXRSServerFactoryBean;
+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.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java?rev=1136441&r1=1136440&r2=1136441&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java Thu Jun 16 14:04:31 2011
@@ -17,7 +17,6 @@
package org.apache.camel.component.cxf.spring;
import org.apache.camel.component.cxf.jaxrs.testbean.CustomerService;
-import org.apache.camel.component.cxf.spring.CxfRsClientFactoryBeanDefinitionParser.SpringJAXRSClientFactoryBean;
import org.junit.Test;
public class CxfRsClientFactoryBeanTest extends AbstractSpringBeanTestSupport {
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanTest.java?rev=1136441&r1=1136440&r2=1136441&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanTest.java Thu Jun 16 14:04:31 2011
@@ -19,7 +19,6 @@ package org.apache.camel.component.cxf.s
import java.util.List;
import org.apache.camel.component.cxf.jaxrs.testbean.CustomerService;
-import org.apache.camel.component.cxf.spring.CxfRsServerFactoryBeanDefinitionParser.SpringJAXRSServerFactoryBean;
import org.junit.Test;
public class CxfRsServerFactoryBeanTest extends AbstractSpringBeanTestSupport {