You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/07/29 14:46:54 UTC
svn commit: r798878 - in /camel/branches/camel-1.x: ./
components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/
components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/
Author: ningjiang
Date: Wed Jul 29 12:46:54 2009
New Revision: 798878
URL: http://svn.apache.org/viewvc?rev=798878&view=rev
Log:
Merged revisions 798864 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r798864 | ningjiang | 2009-07-29 19:56:08 +0800 (Wed, 29 Jul 2009) | 1 line
CAMEL-1856 Added ProxyProcessor according to Rong's request
........
Added:
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/ProxyProcessor.java
- copied unchanged from r798864, camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/ProxyProcessor.java
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelJBIClientProxyTest.java
camel/branches/camel-1.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CamelJBIClientProxy.xml
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 12:46:54 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelJBIClientProxyTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelJBIClientProxyTest.java?rev=798878&r1=798877&r2=798878&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelJBIClientProxyTest.java (original)
+++ camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelJBIClientProxyTest.java Wed Jul 29 12:46:54 2009
@@ -17,6 +17,10 @@
package org.apache.camel.component.cxf.transport;
import junit.framework.TestCase;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ProducerTemplate;
+
import org.apache.camel.component.cxf.HelloService;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -35,11 +39,20 @@
assertNotNull("The proxy should not be null.", proxy);
}
- public void testEchoMethod() {
+
+ public void testCallFromProxy() {
String response = proxy.echo("Hello World!");
assertEquals("Get a wrong response ", "echo Hello World!", response);
}
+ public void testCallFromCamel() {
+ // get camel context
+ CamelContext context = (CamelContext) applicationContext.getBean("conduit_context");
+ ProducerTemplate producer = context.createProducerTemplate();
+ String response = (String)producer.requestBody("direct://jbiStart", "Hello");
+ assertEquals("Get a wrong response ", "echo Hello World!", response);
+ }
+
public void tearDown() {
if (applicationContext != null) {
applicationContext.stop();
Modified: camel/branches/camel-1.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CamelJBIClientProxy.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CamelJBIClientProxy.xml?rev=798878&r1=798877&r2=798878&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CamelJBIClientProxy.xml (original)
+++ camel/branches/camel-1.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/transport/CamelJBIClientProxy.xml Wed Jul 29 12:46:54 2009
@@ -35,8 +35,12 @@
<camelContext id="conduit_context" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="direct://start" />
- <process ref="myProcessor" />
+ <from uri="direct://jbiStart"/>
+ <process ref="proxyProcessor"/>
+ </route>
+ <route>
+ <from uri="direct://jbiService" />
+ <process ref="serviceProcessor" />
</route>
</camelContext>
@@ -44,11 +48,15 @@
<camel:camelContextRef>conduit_context</camel:camelContextRef>
</camel:conduit>
- <bean id="myProcessor" class="org.apache.camel.component.cxf.transport.JbiServiceProcessor"/>
+ <bean id="proxyProcessor" class="org.apache.camel.component.cxf.transport.ProxyProcessor">
+ <property name="helloService" ref="client"/>
+ </bean>
+
+ <bean id="serviceProcessor" class="org.apache.camel.component.cxf.transport.JbiServiceProcessor"/>
<simple:client id="client"
serviceClass="org.apache.camel.component.cxf.HelloService"
- address="camel://direct://start"
+ address="camel://direct://jbiService"
serviceName="s:service"
xmlns:s="http://cxf.component.camel.apache.org"
endpointName="s:portA"
@@ -56,15 +64,4 @@
transportId="http://cxf.apache.org/transports/camel">
</simple:client>
-
-
- <!-- simple:server id="server"
- serviceClass="org.apache.camel.component.cxf.HelloServiceImpl"
- address="camel://direct://end"
- serviceName="s:service"
- xmlns:s="http://camel.apache.org/camel-test"
- endpointName="s:portA"
- bindingId="http://cxf.apache.org/bindings/jbi"
- transportId="http://cxf.apache.org/transports/camel">
- </simple:server -->
</beans>