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/04/22 10:59:01 UTC
svn commit: r767414 - in /camel/branches/camel-1.x: ./
tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/
tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/
Author: ningjiang
Date: Wed Apr 22 08:59:00 2009
New Revision: 767414
URL: http://svn.apache.org/viewvc?rev=767414&view=rev
Log:
Merged revisions 767403 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r767403 | ningjiang | 2009-04-22 16:05:12 +0800 (Wed, 22 Apr 2009) | 1 line
Added an integration test of Mulitcast according to the mail list
........
Added:
camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java
- copied unchanged from r767403, camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java
camel/branches/camel-1.x/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyFileMulticastTest-context.xml
- copied, changed from r767403, camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyFileMulticastTest-context.xml
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java
camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java
camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/SetResponseProcessor.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 22 08:59:00 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
+/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
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java?rev=767414&r1=767413&r2=767414&view=diff
==============================================================================
--- camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java (original)
+++ camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java Wed Apr 22 08:59:00 2009
@@ -54,8 +54,8 @@
}
private void validMockes() throws Exception {
- resultEndpoint.reset();
assertNotNull(resultEndpoint);
+ resultEndpoint.reset();
ProducerTemplate<Exchange> template = camelContext.createProducerTemplate();
template.sendBodyAndHeader("jetty:http://localhost:9000/test", "Hello form Willem", "Operation", "greetMe");
Modified: camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java?rev=767414&r1=767413&r2=767414&view=diff
==============================================================================
--- camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java (original)
+++ camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java Wed Apr 22 08:59:00 2009
@@ -40,7 +40,7 @@
}
});
- assertEquals("get result ", "<message>out</message>", exchange.getOut().getBody(String.class));
+ assertEquals("get result ", "<response><hello>Willem</hello></response>", exchange.getOut().getBody(String.class));
Thread.sleep(2000);
}
Modified: camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/SetResponseProcessor.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/SetResponseProcessor.java?rev=767414&r1=767413&r2=767414&view=diff
==============================================================================
--- camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/SetResponseProcessor.java (original)
+++ camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/SetResponseProcessor.java Wed Apr 22 08:59:00 2009
@@ -26,9 +26,9 @@
public void process(Exchange exchange) throws Exception {
// Convert the input stream into a string
- String result = exchange.getIn().getBody(String.class);
-
- exchange.getOut().setBody("<message>out</message>");
+ String request = exchange.getIn().getBody(String.class);
+
+ exchange.getOut().setBody("<response>" + request + "</response>");
}
Copied: camel/branches/camel-1.x/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyFileMulticastTest-context.xml (from r767403, camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyFileMulticastTest-context.xml)
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyFileMulticastTest-context.xml?p2=camel/branches/camel-1.x/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyFileMulticastTest-context.xml&p1=camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyFileMulticastTest-context.xml&r1=767403&r2=767414&rev=767414&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyFileMulticastTest-context.xml (original)
+++ camel/branches/camel-1.x/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyFileMulticastTest-context.xml Wed Apr 22 08:59:00 2009
@@ -20,13 +20,13 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
<bean id="SetResponseProcessor" class="org.apache.camel.itest.jetty.SetResponseProcessor"/>
<!-- START SNIPPET: example -->
- <camelContext xmlns="http://camel.apache.org/schema/spring" trace="true">
+ <camelContext xmlns="http://activemq.apache.org/camel/schema/spring" trace="true">
<route>
<from uri="jetty:http://localhost:9000/test"/>
<process ref="SetResponseProcessor"/>