You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2013/01/04 14:41:15 UTC
svn commit: r1428842 - in
/camel/trunk/components/camel-spring-integration/src:
main/java/org/apache/camel/component/spring/integration/
test/java/org/apache/camel/component/spring/integration/
test/java/org/apache/camel/component/spring/integration/ad...
Author: cmueller
Date: Fri Jan 4 13:41:15 2013
New Revision: 1428842
URL: http://svn.apache.org/viewvc?rev=1428842&view=rev
Log:
CAMEL-5926: SpringIntegrationConsumer should honor the 'inOut' instance variable by setting the MEP and sending back message headers
Modified:
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/MyProcessor.java
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationProducerTest.java
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/oneWayConsumer.xml
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/producer.xml
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/springChannelConverter.xml
camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml
Modified: camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java?rev=1428842&r1=1428841&r2=1428842&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java (original)
+++ camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java Fri Jan 4 13:41:15 2013
@@ -42,7 +42,7 @@ public final class SpringIntegrationBind
}
public static org.springframework.integration.Message<?> storeToSpringIntegrationMessage(org.apache.camel.Message message) {
- return new GenericMessage<Object>(message.getBody());
+ return new GenericMessage<Object>(message.getBody(), message.getHeaders());
}
public static void storeToCamelMessage(org.springframework.integration.Message<?> siMessage, org.apache.camel.Message cMessage) {
Modified: camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java?rev=1428842&r1=1428841&r2=1428842&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java (original)
+++ camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java Fri Jan 4 13:41:15 2013
@@ -17,6 +17,7 @@
package org.apache.camel.component.spring.integration;
import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultConsumer;
import org.apache.camel.spring.SpringCamelContext;
@@ -78,7 +79,7 @@ public class SpringIntegrationConsumer
// if we do in-out we need to setup the input channel as well
if (getEndpoint().isInOut()) {
- // we need to setup right inputChannel for further processing
+ // we need to setup right outputChannel for further processing
ObjectHelper.notEmpty(getEndpoint().getOutputChannel(), "OutputChannel", getEndpoint());
outputChannel = channelResolver.resolveChannelName(getEndpoint().getOutputChannel());
@@ -89,11 +90,11 @@ public class SpringIntegrationConsumer
inputChannel.subscribe(this);
}
-
+
public void handleMessage(org.springframework.integration.Message<?> siInMessage) {
// we received a message from spring integration
// wrap that in a Camel Exchange and process it
- Exchange exchange = getEndpoint().createExchange();
+ Exchange exchange = getEndpoint().createExchange(getEndpoint().isInOut() ? ExchangePattern.InOut : ExchangePattern.InOnly);
exchange.setIn(new SpringIntegrationMessage(siInMessage));
// process the exchange
Modified: camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/MyProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/MyProcessor.java?rev=1428842&r1=1428841&r2=1428842&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/MyProcessor.java (original)
+++ camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/MyProcessor.java Fri Jan 4 13:41:15 2013
@@ -22,8 +22,8 @@ import org.apache.camel.Processor;
public class MyProcessor implements Processor {
public void process(Exchange exchange) throws Exception {
- String request = (String) exchange.getIn().getBody();
- String result = request + " is processed";
+ exchange.getOut().setHeader("Status", "Done");
+ String result = exchange.getIn().getBody() + " is processed";
exchange.getOut().setBody(result);
}
Modified: camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java?rev=1428842&r1=1428841&r2=1428842&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java (original)
+++ camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java Fri Jan 4 13:41:15 2013
@@ -24,17 +24,18 @@ import org.springframework.integration.M
import org.springframework.integration.message.GenericMessage;
public class SpringIntegrationOneWayConsumerTest extends CamelSpringTestSupport {
+
private static final String MESSAGE_BODY = "hello world";
@Test
public void testSendingOneWayMessage() throws Exception {
- MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
+ MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
resultEndpoint.expectedBodiesReceived(MESSAGE_BODY);
- MessageChannel outputChannel = applicationContext.getBean("outputChannel", MessageChannel.class);
+ MessageChannel outputChannel = getMandatoryBean(MessageChannel.class, "outputChannel");
outputChannel.send(new GenericMessage<Object>(MESSAGE_BODY));
- resultEndpoint.assertIsSatisfied();
+ assertMockEndpointsSatisfied();
}
public ClassPathXmlApplicationContext createApplicationContext() {
Modified: camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationProducerTest.java?rev=1428842&r1=1428841&r2=1428842&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationProducerTest.java (original)
+++ camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationProducerTest.java Fri Jan 4 13:41:15 2013
@@ -16,28 +16,28 @@
*/
package org.apache.camel.component.spring.integration;
-import org.apache.camel.ExchangePattern;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringIntegrationProducerTest extends CamelSpringTestSupport {
- protected ClassPathXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/spring/integration/producer.xml");
- }
-
@Test
public void testSendingTwoWayMessage() throws Exception {
- String result = (String) template.sendBody("direct:twowayMessage", ExchangePattern.InOut, "Willem");
+ String result = template.requestBody("direct:twowayMessage", "Willem", String.class);
+
assertEquals("Can't get the right response", result, "Hello Willem");
}
-
+
@Test
public void testSendingOneWayMessage() throws Exception {
template.sendBody("direct:onewayMessage", "Greet");
- HelloWorldService service = applicationContext.getBean("helloService", HelloWorldService.class);
+
+ HelloWorldService service = getMandatoryBean(HelloWorldService.class, "helloService");
assertEquals("We should call the service", service.getGreetName(), "Greet");
}
+ protected ClassPathXmlApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/camel/component/spring/integration/producer.xml");
+ }
}
Modified: camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java?rev=1428842&r1=1428841&r2=1428842&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java (original)
+++ camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java Fri Jan 4 13:41:15 2013
@@ -18,6 +18,8 @@ package org.apache.camel.component.sprin
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Test;
@@ -30,28 +32,33 @@ import org.springframework.integration.c
import org.springframework.integration.message.GenericMessage;
public class SpringIntegrationTwoWayConsumerTest extends CamelSpringTestSupport {
- private static final String MESSAGE_BODY = "Request message";
+
+ private static final String MESSAGE_BODY = "Request message";
@Test
public void testSendingTwoWayMessage() throws Exception {
- MessageChannel requestChannel = applicationContext.getBean("requestChannel", MessageChannel.class);
+ final CountDownLatch latch = new CountDownLatch(1);
+ MessageChannel requestChannel = getMandatoryBean(MessageChannel.class, "requestChannel");
Map<String, Object> maps = new HashMap<String, Object>();
maps.put(MessageHeaders.REPLY_CHANNEL, "responseChannel");
-
Message<String> message = new GenericMessage<String>(MESSAGE_BODY, maps);
- DirectChannel responseChannel = applicationContext.getBean("responseChannel", DirectChannel.class);
+ DirectChannel responseChannel = getMandatoryBean(DirectChannel.class, "responseChannel");
responseChannel.subscribe(new MessageHandler() {
public void handleMessage(Message<?> message) {
- String result = (String) message.getPayload();
- assertEquals("Get the wrong result", MESSAGE_BODY + " is processed", result);
+ latch.countDown();
+ assertEquals("Get the wrong result", MESSAGE_BODY + " is processed", message.getPayload());
+ assertEquals("Done", message.getHeaders().get("Status"));
}
});
+
requestChannel.send(message);
+
+ assertTrue(latch.await(1, TimeUnit.SECONDS));
}
public ClassPathXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/component/spring/integration/twoWayConsumer.xml");
}
-}
+}
\ No newline at end of file
Modified: camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java?rev=1428842&r1=1428841&r2=1428842&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java (original)
+++ camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java Fri Jan 4 13:41:15 2013
@@ -16,7 +16,9 @@
*/
package org.apache.camel.component.spring.integration.adapter;
-import org.apache.camel.ExchangePattern;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -25,20 +27,27 @@ import org.springframework.integration.c
import org.springframework.integration.core.MessageHandler;
public class CamelSourceAdapterTest extends CamelSpringTestSupport {
+
@Test
public void testSendingOneWayMessage() throws Exception {
- DirectChannel channelA = applicationContext.getBean("channelA", DirectChannel.class);
+ final CountDownLatch latch = new CountDownLatch(1);
+ DirectChannel channelA = getMandatoryBean(DirectChannel.class, "channelA");
channelA.subscribe(new MessageHandler() {
public void handleMessage(Message<?> message) {
+ latch.countDown();
assertEquals("We should get the message from channelA", message.getPayload(), "Willem");
}
});
+
template.sendBody("direct:OneWay", "Willem");
+
+ assertTrue(latch.await(1, TimeUnit.SECONDS));
}
@Test
public void testSendingTwoWayMessage() throws Exception {
- String result = (String) template.sendBody("direct:TwoWay", ExchangePattern.InOut, "Willem");
+ String result = template.requestBody("direct:TwoWay", "Willem", String.class);
+
assertEquals("Can't get the right response", result, "Hello Willem");
}
Modified: camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java?rev=1428842&r1=1428841&r2=1428842&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java (original)
+++ camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java Fri Jan 4 13:41:15 2013
@@ -18,6 +18,8 @@ package org.apache.camel.component.sprin
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
@@ -31,48 +33,57 @@ import org.springframework.integration.c
import org.springframework.integration.message.GenericMessage;
public class CamelTargetAdapterTest extends CamelSpringTestSupport {
+
private static final String MESSAGE_BODY = "hello world";
@Test
public void testSendingOneWayMessage() throws Exception {
- MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
+ MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
resultEndpoint.expectedBodiesReceived(MESSAGE_BODY);
- MessageChannel outputChannel = applicationContext.getBean("channelA", MessageChannel.class);
+
+ MessageChannel outputChannel = getMandatoryBean(MessageChannel.class, "channelA");
outputChannel.send(new GenericMessage<Object>(MESSAGE_BODY));
- resultEndpoint.assertIsSatisfied();
+
+ assertMockEndpointsSatisfied();
}
@Test
public void testSendingTwoWayMessage() throws Exception {
-
- MessageChannel requestChannel = applicationContext.getBean("channelB", MessageChannel.class);
+ final CountDownLatch latch = new CountDownLatch(1);
+ MessageChannel requestChannel = getMandatoryBean(MessageChannel.class, "channelB");
Message<?> message = new GenericMessage<Object>(MESSAGE_BODY);
//Need to subscribe the responseChannel first
- DirectChannel responseChannel = (DirectChannel) applicationContext.getBean("channelC");
+ DirectChannel responseChannel = getMandatoryBean(DirectChannel.class, "channelC");
responseChannel.subscribe(new MessageHandler() {
public void handleMessage(Message<?> message) {
- String result = (String) message.getPayload();
- assertEquals("Get the wrong result", MESSAGE_BODY + " is processed", result);
+ latch.countDown();
+ assertEquals("Get the wrong result", MESSAGE_BODY + " is processed", message.getPayload());
}
});
+
requestChannel.send(message);
+
+ assertTrue(latch.await(1, TimeUnit.SECONDS));
}
@Test
public void testSendingTwoWayMessageWithMessageAddress() throws Exception {
-
- MessageChannel requestChannel = applicationContext.getBean("channelD", MessageChannel.class);
- DirectChannel responseChannel = applicationContext.getBean("channelC", DirectChannel.class);
+ final CountDownLatch latch = new CountDownLatch(1);
+ MessageChannel requestChannel = getMandatoryBean(MessageChannel.class, "channelD");
+ DirectChannel responseChannel = getMandatoryBean(DirectChannel.class, "channelC");
Map<String, Object> headers = new HashMap<String, Object>();
headers.put(MessageHeaders.REPLY_CHANNEL, responseChannel);
GenericMessage<String> message = new GenericMessage<String>(MESSAGE_BODY, headers);
responseChannel.subscribe(new MessageHandler() {
public void handleMessage(Message<?> message) {
- String result = (String) message.getPayload();
- assertEquals("Get the wrong result", MESSAGE_BODY + " is processed", result);
+ latch.countDown();
+ assertEquals("Get the wrong result", MESSAGE_BODY + " is processed", message.getPayload());
}
});
- requestChannel.send(message);
+
+ requestChannel.send(message);
+
+ assertTrue(latch.await(1, TimeUnit.SECONDS));
}
@Override
Modified: camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java?rev=1428842&r1=1428841&r2=1428842&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java (original)
+++ camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java Fri Jan 4 13:41:15 2013
@@ -16,19 +16,28 @@
*/
package org.apache.camel.component.spring.integration.adapter;
-import org.junit.Assert;
+import org.junit.After;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-public class ConfigurationTest extends Assert {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class ConfigurationTest {
+
private AbstractXmlApplicationContext context;
+ @After
+ public void tearDown() {
+ context.destroy();
+ }
@Test
public void testCamelSourceEndpoint() throws Exception {
- context = new ClassPathXmlApplicationContext(new String[]{"/org/apache/camel/component/spring/integration/adapter/CamelSource.xml"});
+ context = new ClassPathXmlApplicationContext("/org/apache/camel/component/spring/integration/adapter/CamelSource.xml");
CamelSourceAdapter camelSourceA = context.getBean("camelSourceA", CamelSourceAdapter.class);
+
assertNotNull(camelSourceA);
assertEquals("Get the wrong request channel name", camelSourceA.getChannel().toString(), "channelA");
assertEquals("ExpectReply should be false ", camelSourceA.isExpectReply(), false);
@@ -36,19 +45,17 @@ public class ConfigurationTest extends A
assertNotNull(camelSourceB);
assertEquals("Get the wrong request channel name", camelSourceB.getChannel().toString(), "channelB");
assertEquals("ExpectReply should be true ", camelSourceB.isExpectReply(), true);
- context.destroy();
-
}
@Test
public void testCamelTragetEndpoint() throws Exception {
context = new ClassPathXmlApplicationContext(new String[]{"/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml"});
CamelTargetAdapter camelTargetA = context.getBean("camelTargetA", CamelTargetAdapter.class);
+
assertNotNull(camelTargetA);
assertEquals("Subscript the wrong CamelEndpointUri", camelTargetA.getCamelEndpointUri(), "direct:EndpointA");
CamelTargetAdapter camelTargetB = context.getBean("camelTargetB", CamelTargetAdapter.class);
assertNotNull(camelTargetB);
assertEquals("Subscript the wrong reply channel name", camelTargetB.getReplyChannel().toString(), "channelC");
- context.destroy();
}
}
Modified: camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml?rev=1428842&r1=1428841&r2=1428842&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml (original)
+++ camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml Fri Jan 4 13:41:15 2013
@@ -21,14 +21,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:camel-si="http://camel.apache.org/schema/spring/integration"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd
- http://camel.apache.org/schema/spring/integration
- http://camel.apache.org/schema/spring/integration/camel-spring-integration.xsd
- http://camel.apache.org/schema/spring
- http://camel.apache.org/schema/spring/camel-spring.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+ http://camel.apache.org/schema/spring/integration http://camel.apache.org/schema/spring/integration/camel-spring-integration.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
<!-- END SNIPPET: header -->
@@ -66,6 +62,4 @@
<beans:bean id="myProcessor" class="org.apache.camel.component.spring.integration.MyProcessor"/>
<!-- END SNIPPET: example -->
-</beans:beans>
-
-
+</beans:beans>
\ No newline at end of file
Modified: camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/oneWayConsumer.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/oneWayConsumer.xml?rev=1428842&r1=1428841&r2=1428842&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/oneWayConsumer.xml (original)
+++ camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/oneWayConsumer.xml Fri Jan 4 13:41:15 2013
@@ -18,12 +18,10 @@
<beans:beans xmlns="http://www.springframework.org/schema/integration"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd
- http://camel.apache.org/schema/spring
- http://camel.apache.org/schema/spring/camel-spring.xsd">
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<!-- spring integration channel -->
<channel id="outputChannel"/>
Modified: camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/producer.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/producer.xml?rev=1428842&r1=1428841&r2=1428842&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/producer.xml (original)
+++ camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/producer.xml Fri Jan 4 13:41:15 2013
@@ -19,12 +19,10 @@
<beans:beans xmlns="http://www.springframework.org/schema/integration"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd
- http://camel.apache.org/schema/spring
- http://camel.apache.org/schema/spring/camel-spring.xsd">
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<!-- spring integration channels -->
<channel id="inputChannel"/>
Modified: camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/springChannelConverter.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/springChannelConverter.xml?rev=1428842&r1=1428841&r2=1428842&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/springChannelConverter.xml (original)
+++ camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/springChannelConverter.xml Fri Jan 4 13:41:15 2013
@@ -19,12 +19,10 @@
<beans:beans xmlns="http://www.springframework.org/schema/integration"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd
- http://camel.apache.org/schema/spring
- http://camel.apache.org/schema/spring/camel-spring.xsd">
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<!-- START SNIPPET: example -->
<!-- spring integration channel -->
Modified: camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml?rev=1428842&r1=1428841&r2=1428842&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml (original)
+++ camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml Fri Jan 4 13:41:15 2013
@@ -19,12 +19,10 @@
<beans:beans xmlns="http://www.springframework.org/schema/integration"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration.xsd
- http://camel.apache.org/schema/spring
- http://camel.apache.org/schema/spring/camel-spring.xsd">
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<!-- START SNIPPET: example -->
<!-- spring integration channels -->