Author: ningjiang
Date: Wed Nov 9 08:47:32 2011
New Revision: 1199654
URL: http://svn.apache.org/viewvc?rev=1199654&view=rev
Log:
CAMEL-4648 Clean up the code of CxfRsEndpoint of getting configuration from
spring or blueprint
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientBlueprintBean.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerBlueprintBean.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBlueprintEndpoint.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientBlueprintBean.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientBlueprintBean.java?rev=1199654&r1=1199653&r2=1199654&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientBlueprintBean.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientBlueprintBean.java
Wed Nov 9 08:47:32 2011
@@ -40,13 +40,5 @@ public class RsClientBlueprintBean exten
public void setBundleContext(BundleContext bundleContext) {
this.bundleContext = bundleContext;
}
-
- public RsClientBlueprintBean copy() {
- try {
- return (RsClientBlueprintBean) clone();
- } catch (CloneNotSupportedException e) {
- throw new RuntimeCamelException(e);
- }
- }
}
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerBlueprintBean.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerBlueprintBean.java?rev=1199654&r1=1199653&r2=1199654&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerBlueprintBean.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerBlueprintBean.java
Wed Nov 9 08:47:32 2011
@@ -42,12 +42,4 @@ public class RsServerBlueprintBean exten
this.bundleContext = bundleContext;
}
- public RsServerBlueprintBean copy() {
- try {
- return (RsServerBlueprintBean) clone();
- } catch (CloneNotSupportedException e) {
- throw new RuntimeCamelException(e);
- }
- }
-
}
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBlueprintEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBlueprintEndpoint.java?rev=1199654&r1=1199653&r2=1199654&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBlueprintEndpoint.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBlueprintEndpoint.java
Wed Nov 9 08:47:32 2011
@@ -68,13 +68,13 @@ public class CxfRsBlueprintEndpoint exte
@Override
protected JAXRSServerFactoryBean newJAXRSServerFactoryBean() {
checkBeanType(bean, JAXRSServerFactoryBean.class);
- return ((RsServerBlueprintBean)bean).copy();
+ return (RsServerBlueprintBean)bean;
}
@Override
protected JAXRSClientFactoryBean newJAXRSClientFactoryBean() {
checkBeanType(bean, JAXRSClientFactoryBean.class);
- return ((RsClientBlueprintBean)bean).copy();
+ return (RsClientBlueprintBean)bean;
}
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java?rev=1199654&r1=1199653&r2=1199654&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java
Wed Nov 9 08:47:32 2011
@@ -30,9 +30,8 @@ import org.springframework.context.suppo
public class CxfRsSpringEndpoint extends CxfRsEndpoint implements BeanIdAware {
private AbstractJAXRSFactoryBean bean;
- private ApplicationContext applicationContext;
private String beanId;
- private ConfigurerImpl configurer;
+
public CxfRsSpringEndpoint(CamelContext context, AbstractJAXRSFactoryBean
bean) throws Exception {
super(bean.getAddress(), context);
@@ -44,35 +43,15 @@ public class CxfRsSpringEndpoint extends
if (bean instanceof BeanIdAware) {
setBeanId(((BeanIdAware)bean).getBeanId());
}
- applicationContext =
((SpringCamelContext)getCamelContext()).getApplicationContext();
- // create configurer
- configurer = new ConfigurerImpl(applicationContext);
}
- void configure(Object beanInstance) {
- // check the ApplicationContext states first , and call the refresh if
necessary
- if (applicationContext instanceof AbstractApplicationContext) {
- AbstractApplicationContext context = (AbstractApplicationContext)
applicationContext;
- if (!context.isActive()) {
- context.refresh();
- }
- }
- configurer.configureBean(beanId, beanInstance);
- }
-
-
-
@Override
protected void setupJAXRSServerFactoryBean(JAXRSServerFactoryBean sfb) {
- checkBeanType(bean, JAXRSServerFactoryBean.class);
- configure(sfb);
-
+ // Do nothing here
}
@Override
protected void setupJAXRSClientFactoryBean(JAXRSClientFactoryBean cfb,
String address) {
- checkBeanType(bean, JAXRSClientFactoryBean.class);
- configure(cfb);
cfb.setAddress(address);
// Need to enable the option of ThreadSafe
cfb.setThreadSafe(true);
@@ -80,12 +59,14 @@ public class CxfRsSpringEndpoint extends
@Override
protected JAXRSServerFactoryBean newJAXRSServerFactoryBean() {
- return new SpringJAXRSServerFactoryBean();
+ checkBeanType(bean, JAXRSServerFactoryBean.class);
+ return (JAXRSServerFactoryBean)bean;
}
@Override
protected JAXRSClientFactoryBean newJAXRSClientFactoryBean() {
- return new SpringJAXRSClientFactoryBean();
+ checkBeanType(bean, JAXRSClientFactoryBean.class);
+ return (JAXRSClientFactoryBean)bean;
}
public String getBeanId() {
