Author: ningjiang
Date: Sat Sep 10 03:25:56 2011
New Revision: 1167449
URL: http://svn.apache.org/viewvc?rev=1167449&view=rev
Log:
Merged revisions 1163231 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1163231 | ningjiang | 2011-08-30 22:31:46 +0800 (Tue, 30 Aug 2011) | 1 line
CAMEL-4351 removed SpringCXFEndpoint configure method as it should not be
used anymore
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfEndpointTest.java
camel/branches/camel-2.8.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeans.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 10 03:25:56 2011
@@ -1 +1 @@
-/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163420,1164557,1164633,1164973-1165000,1165152,1165157,1165658,1165971,1165987,1167098
+/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163231,1163420,1164557,1164633,1164973-1165000,1165152,1165157,1165658,1165971,1165987,1167098
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java?rev=1167449&r1=1167448&r2=1167449&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
Sat Sep 10 03:25:56 2011
@@ -50,7 +50,6 @@ import org.springframework.context.Confi
public class CxfSpringEndpoint extends CxfEndpoint implements
ApplicationContextAware {
private String beanId;
- private ConfigurerImpl configurer;
private ApplicationContext applicationContext;
public CxfSpringEndpoint(CamelContext context, String address) throws
Exception {
@@ -113,9 +112,6 @@ public class CxfSpringEndpoint extends C
// create client factory bean
ClientProxyFactoryBean factoryBean = createClientFactoryBean(cls);
- // configure client factory bean by CXF configurer
- configure(factoryBean);
-
// setup client factory bean
setupClientFactoryBean(factoryBean, cls);
@@ -139,9 +135,6 @@ public class CxfSpringEndpoint extends C
ClientFactoryBean factoryBean = createClientFactoryBean();
- // configure client factory bean by CXF configurer
- configure(factoryBean);
-
// setup client factory bean
setupClientFactoryBean(factoryBean);
@@ -193,9 +186,6 @@ public class CxfSpringEndpoint extends C
answer = new ServerFactoryBean();
}
- // configure server factory bean by CXF configurer
- configure(answer);
-
// setup server factory bean
setupServerFactoryBean(answer, cls);
@@ -214,17 +204,6 @@ public class CxfSpringEndpoint extends C
return answer;
}
- void configure(Object beanInstance) {
- // check the ApplicationContext states first , and call the refresh if
necessary
- if (((SpringCamelContext)getCamelContext()).getApplicationContext()
instanceof ConfigurableApplicationContext) {
- ConfigurableApplicationContext context =
(ConfigurableApplicationContext)((SpringCamelContext)getCamelContext()).getApplicationContext();
- if (!context.isActive()) {
- context.refresh();
- }
- }
- configurer.configureBean(beanId, beanInstance);
- }
-
// Properties
//
-------------------------------------------------------------------------
public String getBeanId() {
@@ -308,7 +287,6 @@ public class CxfSpringEndpoint extends C
@SuppressWarnings("deprecation")
public void setApplicationContext(ApplicationContext ctx) throws
BeansException {
applicationContext = ctx;
- configurer = new ConfigurerImpl(applicationContext);
if (bus == null) {
if (Version.getCurrentVersion().startsWith("2.3")) {
Modified:
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfEndpointTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfEndpointTest.java?rev=1167449&r1=1167448&r2=1167449&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfEndpointTest.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfEndpointTest.java
Sat Sep 10 03:25:56 2011
@@ -55,12 +55,10 @@ public class CxfEndpointTest extends Ass
new ClassPathXmlApplicationContext(new
String[]{"org/apache/camel/component/cxf/CxfEndpointBeans.xml"});
CxfComponent cxfComponent = new CxfComponent(new
SpringCamelContext(ctx));
CxfSpringEndpoint endpoint =
(CxfSpringEndpoint)cxfComponent.createEndpoint("cxf://bean:serviceEndpoint");
-
- ServerFactoryBean svf = new ServerFactoryBean();
- endpoint.configure(svf);
- assertEquals("Got the wrong endpoint address", svf.getAddress(),
"http://localhost:"; + port2 + "/helloworld");
+ assertEquals("Got the wrong endpoint address", endpoint.getAddress(),
+ "http://localhost:"; + port2 + "/helloworld");
assertEquals("Got the wrong endpont service class",
- svf.getServiceClass().getCanonicalName(),
+ endpoint.getServiceClass().getCanonicalName(),
"org.apache.camel.component.cxf.HelloService");
}
Modified:
camel/branches/camel-2.8.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeans.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeans.xml?rev=1167449&r1=1167448&r2=1167449&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeans.xml
(original)
+++
camel/branches/camel-2.8.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeans.xml
Sat Sep 10 03:25:56 2011
@@ -40,4 +40,15 @@
<cxf:cxfEndpoint id="serviceEndpoint"
address="http://localhost:${CxfEndpointBeanTest.port2}/helloworld";
serviceClass="org.apache.camel.component.cxf.HelloService"/>
+ <camelContext xmlns="http://camel.apache.org/schema/spring";>
+ <route>
+ <from uri="direct:start" />
+ <to uri="cxf:bean:myEndpoint" />
+ </route>
+ <route>
+ <from uri="cxf:bean:myEndpoint" />
+ <to uri="mock:result" />
+ </route>
+ </camelContext>
+
</beans>
