Author: jstrachan
Date: Sat May 5 01:41:50 2007
New Revision: 535478
URL: http://svn.apache.org/viewvc?view=rev&rev=535478
Log:
renamed CamelClient -> CamelTemplate to match more closely the spring naming
convensions
Added:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelTemplate.java
(contents, props changed)
- copied, changed from r535470,
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelClient.java
Removed:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelClient.java
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/JoinRoutesTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespacesFilterTest.java
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConstants.java
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportBase.java
activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfInvokeTest.java
activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java
activemq/camel/trunk/camel-cxf/src/test/resources/wsdl/camel_test.wsdl
activemq/camel/trunk/camel-eg-jms-file/src/main/java/org/apache/camel/samples/jmstofile/CamelJmsToFileSample.java
activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/component/jms/MessageListenerProcessor.java
activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
activemq/camel/trunk/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
activemq/camel/trunk/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/ContentBasedRouteTest.java
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
Copied:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelTemplate.java
(from r535470,
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelClient.java)
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelTemplate.java?view=diff&rev=535478&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelClient.java&r1=535470&p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelTemplate.java&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelClient.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelTemplate.java
Sat May 5 01:41:50 2007
@@ -21,15 +21,17 @@
import org.apache.camel.util.ProducerCache;
/**
- * A Client object for working with Camel and invoking [EMAIL PROTECTED]
Endpoint} instances with [EMAIL PROTECTED] Exchange} instances
+ * A client helper object (named like Spring's TransactionTemplate &
JmsTemplate et al)
+ * for working with Camel and sending [EMAIL PROTECTED] Message} instances in
an [EMAIL PROTECTED] Exchange}
+ * to an [EMAIL PROTECTED] Endpoint}.
*
* @version $Revision$
*/
-public class CamelClient<E extends Exchange> extends ServiceSupport {
+public class CamelTemplate<E extends Exchange> extends ServiceSupport {
private CamelContext context;
private ProducerCache<E> producerCache = new ProducerCache<E>();
- public CamelClient(CamelContext context) {
+ public CamelTemplate(CamelContext context) {
this.context = context;
}
Propchange:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelTemplate.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelTemplate.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelTemplate.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
Sat May 5 01:41:50 2007
@@ -18,24 +18,23 @@
package org.apache.camel;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.DefaultExchange;
-import org.apache.camel.CamelClient;
+import org.apache.camel.CamelTemplate;
import org.apache.camel.builder.RouteBuilder;
/**
- * A useful base class which creates a [EMAIL PROTECTED] CamelContext} with
some routes along with a [EMAIL PROTECTED] CamelClient}
+ * A useful base class which creates a [EMAIL PROTECTED] CamelContext} with
some routes along with a [EMAIL PROTECTED] CamelTemplate}
* for use in the test case
*
* @version $Revision: 1.1 $
*/
public abstract class ContextTestSupport extends TestSupport {
protected CamelContext context;
- protected CamelClient<Exchange> client;
+ protected CamelTemplate<Exchange> template;
@Override
protected void setUp() throws Exception {
context = createCamelContext();
- client = new CamelClient<Exchange>(context);
+ template = new CamelTemplate<Exchange>(context);
context.addRoutes(createRouteBuilder());
@@ -46,7 +45,7 @@
@Override
protected void tearDown() throws Exception {
- client.stop();
+ template.stop();
context.stop();
}
@@ -73,7 +72,7 @@
* @param body the body for the message
*/
protected void sendBody(String endpointUri, final Object body) {
- client.send(endpointUri, new Processor() {
+ template.send(endpointUri, new Processor() {
public void process(Exchange exchange) {
Message in = exchange.getIn();
in.setBody(body);
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java
Sat May 5 01:41:50 2007
@@ -62,7 +62,7 @@
}
protected void sendMessage(final Object headerValue, final Object body)
throws Exception {
- client.send(startEndpoint, new Processor() {
+ template.send(startEndpoint, new Processor() {
public void process(Exchange exchange) {
// now lets fire in a message
Message in = exchange.getIn();
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java
Sat May 5 01:41:50 2007
@@ -78,7 +78,7 @@
throw new RuntimeException("Failed to process due to
attempt: " + attempt + " being less than: " + failUntilAttempt);
}
else {
- client.send("mock:success", exchange);
+ template.send("mock:success", exchange);
}
}
};
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java
Sat May 5 01:41:50 2007
@@ -65,7 +65,7 @@
}
protected void sendMessage(final Object headerValue, final Object body)
throws Exception {
- client.send(startEndpoint, new Processor() {
+ template.send(startEndpoint, new Processor() {
public void process(Exchange exchange) {
// now lets fire in a message
Message in = exchange.getIn();
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java
Sat May 5 01:41:50 2007
@@ -48,7 +48,7 @@
}
protected void sendMessage(final Object messageId, final Object body) {
- client.send(startEndpoint, new Processor() {
+ template.send(startEndpoint, new Processor() {
public void process(Exchange exchange) {
// now lets fire in a message
Message in = exchange.getIn();
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/JoinRoutesTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/JoinRoutesTest.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/JoinRoutesTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/JoinRoutesTest.java
Sat May 5 01:41:50 2007
@@ -42,7 +42,7 @@
}
protected void sendMessage(final Object headerValue, final Object body)
throws Exception {
- client.send(startEndpoint, new Processor() {
+ template.send(startEndpoint, new Processor() {
public void process(Exchange exchange) {
// now lets fire in a message
Message in = exchange.getIn();
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastTest.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastTest.java
Sat May 5 01:41:50 2007
@@ -38,7 +38,7 @@
y.expectedBodiesReceived("input+output");
z.expectedBodiesReceived("input+output");
- client.send("direct:a", new Processor() {
+ template.send("direct:a", new Processor() {
public void process(Exchange exchange) {
Message in = exchange.getIn();
in.setBody("input");
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java
Sat May 5 01:41:50 2007
@@ -33,7 +33,7 @@
public void testSendMessageThroughAPipeline() throws Exception {
resultEndpoint.expectedBodiesReceived(4);
- client.send("direct:a", new Processor() {
+ template.send("direct:a", new Processor() {
public void process(Exchange exchange) {
// now lets fire in a message
Message in = exchange.getIn();
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListTest.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListTest.java
Sat May 5 01:41:50 2007
@@ -35,7 +35,7 @@
y.expectedBodiesReceived("answer");
z.expectedBodiesReceived("answer");
- client.send("direct:a", new Processor() {
+ template.send("direct:a", new Processor() {
public void process(Exchange exchange) {
Message in = exchange.getIn();
in.setBody("answer");
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java
Sat May 5 01:41:50 2007
@@ -35,7 +35,7 @@
public void testSendingAMessageUsingMulticastReceivesItsOwnExchange()
throws Exception {
resultEndpoint.expectedBodiesReceived("James", "Guillaume", "Hiram",
"Rob");
- client.send("direct:a", new Processor() {
+ template.send("direct:a", new Processor() {
public void process(Exchange exchange) {
Message in = exchange.getIn();
in.setBody("James,Guillaume,Hiram,Rob");
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java
Sat May 5 01:41:50 2007
@@ -22,7 +22,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.xml.XPathBuilder;
import org.apache.camel.builder.xml.NamespaceBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -36,7 +35,7 @@
public void testSendMatchingMessage() throws Exception {
resultEndpoint.expectedMessageCount(1);
- client.sendBody("direct:start", "<person
xmlns='http://acme.com/cheese' name='James' city='London'/>");
+ template.sendBody("direct:start", "<person
xmlns='http://acme.com/cheese' name='James' city='London'/>");
resultEndpoint.assertIsSatisfied();
}
@@ -44,7 +43,7 @@
public void testSendNotMatchingMessage() throws Exception {
resultEndpoint.expectedMessageCount(0);
- client.sendBody("direct:start", "<person
xmlns='http://acme.com/cheese' name='Hiram' city='Tampa'/>");
+ template.sendBody("direct:start", "<person
xmlns='http://acme.com/cheese' name='Hiram' city='Tampa'/>");
resultEndpoint.assertIsSatisfied();
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespacesFilterTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespacesFilterTest.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespacesFilterTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespacesFilterTest.java
Sat May 5 01:41:50 2007
@@ -22,7 +22,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.xml.XPathBuilder;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -35,7 +34,7 @@
public void testSendMatchingMessage() throws Exception {
resultEndpoint.expectedMessageCount(1);
- client.sendBody("direct:start", "<person
xmlns='http://acme.com/cheese' name='James' city='London'/>");
+ template.sendBody("direct:start", "<person
xmlns='http://acme.com/cheese' name='James' city='London'/>");
resultEndpoint.assertIsSatisfied();
}
@@ -43,7 +42,7 @@
public void testSendNotMatchingMessage() throws Exception {
resultEndpoint.expectedMessageCount(0);
- client.sendBody("direct:start", "<person
xmlns='http://acme.com/cheese' name='Hiram' city='Tampa'/>");
+ template.sendBody("direct:start", "<person
xmlns='http://acme.com/cheese' name='Hiram' city='Tampa'/>");
resultEndpoint.assertIsSatisfied();
Modified:
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
(original)
+++
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
Sat May 5 01:41:50 2007
@@ -142,7 +142,7 @@
}
private void commitOutputMessage() {
- base.client.send(targetCamelEndpointUri, new Processor() {
+ base.template.send(targetCamelEndpointUri, new Processor() {
public void process(org.apache.camel.Exchange reply) {
Object request = null;
@@ -185,7 +185,7 @@
// We assume that it will only happen in case of the
temp. reply queue.
}
- getLogger().log(Level.FINE, "client sending request: ",
reply.getIn());
+ getLogger().log(Level.FINE, "template sending request: ",
reply.getIn());
}
});
}
@@ -207,7 +207,7 @@
Object result = null;
javax.camel.Message camelMessage1 =
pooledSession.consumer().receive(timeout);
- getLogger().log(Level.FINE, "client received reply: " ,
camelMessage1);
+ getLogger().log(Level.FINE, "template received reply: " ,
camelMessage1);
if (camelMessage1 != null) {
Modified:
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConstants.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConstants.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConstants.java
(original)
+++
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConstants.java
Sat May 5 01:41:50 2007
@@ -27,21 +27,21 @@
public static final String CAMEL_SERVER_RESPONSE_HEADERS =
"org.apache.cxf.camel.server.response.headers";
public static final String CAMEL_REQUEST_MESSAGE =
"org.apache.cxf.camel.request.message";
public static final String CAMEL_RESPONSE_MESSAGE =
"org.apache.cxf.camel.reponse.message";
- public static final String CAMEL_CLIENT_REQUEST_HEADERS =
"org.apache.cxf.camel.client.request.headers";
+ public static final String CAMEL_CLIENT_REQUEST_HEADERS =
"org.apache.cxf.camel.template.request.headers";
public static final String CAMEL_CLIENT_RESPONSE_HEADERS =
- "org.apache.cxf.camel.client.response.headers";
- public static final String CAMEL_CLIENT_RECEIVE_TIMEOUT =
"org.apache.cxf.camel.client.timeout";
+ "org.apache.cxf.camel.template.response.headers";
+ public static final String CAMEL_CLIENT_RECEIVE_TIMEOUT =
"org.apache.cxf.camel.template.timeout";
public static final String CAMEL_SERVER_CONFIGURATION_URI =
"http://cxf.apache.org/configuration/transport/camel-server";;
public static final String CAMEL_CLIENT_CONFIGURATION_URI =
- "http://cxf.apache.org/configuration/transport/camel-client";;
+ "http://cxf.apache.org/configuration/transport/camel-template";;
public static final String ENDPOINT_CONFIGURATION_URI =
"http://cxf.apache.org/jaxws/endpoint-config";;
public static final String SERVICE_CONFIGURATION_URI =
"http://cxf.apache.org/jaxws/service-config";;
public static final String PORT_CONFIGURATION_URI =
"http://cxf.apache.org/jaxws/port-config";;
- public static final String CAMEL_CLIENT_CONFIG_ID = "camel-client";
+ public static final String CAMEL_CLIENT_CONFIG_ID = "camel-template";
public static final String CAMEL_SERVER_CONFIG_ID = "camel-server";
public static final String CAMEL_REBASED_REPLY_TO =
"org.apache.cxf.camel.server.replyto";
public static final String CAMEL_CORRELATION_ID =
"org.apache.cxf.camel.correlationId";
Modified:
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
(original)
+++
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
Sat May 5 01:41:50 2007
@@ -201,7 +201,7 @@
//setup the reply message
final String replyToUri = getReplyToDestination(inMessage);
- base.client.send(replyToUri, new Processor() {
+ base.template.send(replyToUri, new Processor() {
public void process(Exchange reply) {
base.marshal(currentStream.toString(), replyToUri, reply);
Modified:
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportBase.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportBase.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportBase.java
(original)
+++
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportBase.java
Sat May 5 01:41:50 2007
@@ -19,7 +19,7 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
-import org.apache.camel.CamelClient;
+import org.apache.camel.CamelTemplate;
import org.apache.cxf.Bus;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
@@ -30,7 +30,7 @@
*/
public class CamelTransportBase {
private String replyDestination;
- CamelClient<Exchange> client;
+ CamelTemplate<Exchange> template;
private final CamelContext camelContext;
Bus bus;
EndpointInfo endpointInfo;
@@ -39,7 +39,7 @@
this.camelContext = camelContext;
this.bus = bus;
this.endpointInfo = endpointInfo;
- this.client = new CamelClient<Exchange>(camelContext);
+ this.template = new CamelTemplate<Exchange>(camelContext);
}
public void populateIncomingContext(Exchange exchange, MessageImpl
inMessage, String camelServerRequestHeaders) {
@@ -55,9 +55,9 @@
}
public void close() {
- if (client != null) {
+ if (template != null) {
try {
- client.stop();
+ template.stop();
}
catch (Exception e) {
// do nothing?
Modified:
activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfInvokeTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfInvokeTest.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfInvokeTest.java
(original)
+++
activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfInvokeTest.java
Sat May 5 01:41:50 2007
@@ -22,7 +22,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.Processor;
-import org.apache.camel.CamelClient;
+import org.apache.camel.CamelTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.cxf.endpoint.ServerImpl;
@@ -38,7 +38,7 @@
public class CxfInvokeTest extends TestCase {
private static final transient Log log =
LogFactory.getLog(CxfInvokeTest.class);
protected CamelContext camelContext = new DefaultCamelContext();
- protected CamelClient<CxfExchange> client = new
CamelClient<CxfExchange>(camelContext);
+ protected CamelTemplate<CxfExchange> template = new
CamelTemplate<CxfExchange>(camelContext);
final private String transportAddress = "http://localhost:28080/test";;
final private String testMessage = "Hello World!";
@@ -68,7 +68,7 @@
public void testInvokeOfServer() throws Exception {
CxfExchange exchange =
- client.send(getUri(),
+ template.send(getUri(),
new Processor() {
public void process(final Exchange exchange) {
final List<String> params = new
ArrayList<String>();
Modified:
activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java
(original)
+++
activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java
Sat May 5 01:41:50 2007
@@ -21,31 +21,14 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.TypeConverter;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.CamelClient;
+import org.apache.camel.CamelTemplate;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.cxf.Bus;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.endpoint.ServerImpl;
import org.apache.cxf.bus.CXFBusFactory;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.transport.Conduit;
-import org.apache.cxf.transport.Destination;
-import org.apache.cxf.transport.DestinationFactory;
-import org.apache.cxf.transport.DestinationFactoryManager;
-import org.apache.cxf.transport.MessageObserver;
-import org.apache.cxf.transport.local.LocalConduit;
-import org.apache.cxf.transport.local.LocalTransportFactory;
-import org.xmlsoap.schemas.wsdl.http.AddressType;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
+
import java.util.*;
/**
@@ -54,7 +37,7 @@
public class CxfTest extends TestCase {
private static final transient Log log = LogFactory.getLog(CxfTest.class);
protected CamelContext camelContext = new DefaultCamelContext();
- protected CamelClient<CxfExchange> client = new
CamelClient<CxfExchange>(camelContext);
+ protected CamelTemplate<CxfExchange> template = new
CamelTemplate<CxfExchange>(camelContext);
final private String transportAddress = "http://localhost:28080/test";;
final private String testMessage = "Hello World!";
@@ -84,7 +67,7 @@
public void testInvokeOfServer() throws Exception {
CxfExchange exchange = (CxfExchange)
- client.send(getUri(),
+ template.send(getUri(),
new Processor() {
public void process(final Exchange exchange) {
final List<String> params = new
ArrayList<String>();
Modified: activemq/camel/trunk/camel-cxf/src/test/resources/wsdl/camel_test.wsdl
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/test/resources/wsdl/camel_test.wsdl?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/test/resources/wsdl/camel_test.wsdl
(original)
+++ activemq/camel/trunk/camel-cxf/src/test/resources/wsdl/camel_test.wsdl Sat
May 5 01:41:50 2007
@@ -330,7 +330,7 @@
<camel:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
</camel:address>
- <camel:client messageType="binary"/>
+ <camel:template messageType="binary"/>
<camel:server durableSubscriberName="CXF_subscriber"/>
</port>
</service>
@@ -360,7 +360,7 @@
<camel:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
</camel:address>
- <camel:client messageType="binary"/>
+ <camel:template messageType="binary"/>
<camel:server durableSubscriberName="CXF_subscriber"/>
</port>
</service>
@@ -376,7 +376,7 @@
<camel:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
</camel:address>
- <camel:client messageType="binary"/>
+ <camel:template messageType="binary"/>
<camel:server durableSubscriberName="CXF_subscriber"/>
</port>
</service>
Modified:
activemq/camel/trunk/camel-eg-jms-file/src/main/java/org/apache/camel/samples/jmstofile/CamelJmsToFileSample.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-eg-jms-file/src/main/java/org/apache/camel/samples/jmstofile/CamelJmsToFileSample.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-eg-jms-file/src/main/java/org/apache/camel/samples/jmstofile/CamelJmsToFileSample.java
(original)
+++
activemq/camel/trunk/camel-eg-jms-file/src/main/java/org/apache/camel/samples/jmstofile/CamelJmsToFileSample.java
Sat May 5 01:41:50 2007
@@ -21,7 +21,7 @@
import org.apache.camel.component.jms.JmsComponent;
import javax.jms.ConnectionFactory;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.camel.CamelClient;
+import org.apache.camel.CamelTemplate;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -66,9 +66,9 @@
}
});
// END SNIPPET: e3
- // Camel client - a handy class for kicking off exchanges
+ // Camel template - a handy class for kicking off exchanges
// START SNIPPET: e4
- CamelClient client=new CamelClient(context);
+ CamelTemplate template =new CamelTemplate(context);
// END SNIPPET: e4
// Now everything is set up - lets start the context
context.start();
@@ -80,7 +80,7 @@
// that's it!
// START SNIPPET: e5
for(int i=0;i<10;i++){
- client.sendBody("test-jms:queue:test.queue","Test Message: "+i);
+ template.sendBody("test-jms:queue:test.queue","Test Message: "+i);
}
// END SNIPPET: e5
Thread.sleep(1000);
Modified:
activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/component/jms/MessageListenerProcessor.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/component/jms/MessageListenerProcessor.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/component/jms/MessageListenerProcessor.java
(original)
+++
activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/component/jms/MessageListenerProcessor.java
Sat May 5 01:41:50 2007
@@ -25,7 +25,7 @@
import javax.jms.MessageListener;
/**
- * Represents a JMS [EMAIL PROTECTED] MessageListener} which can be used
directly with any JMS client
+ * Represents a JMS [EMAIL PROTECTED] MessageListener} which can be used
directly with any JMS template
* or derived from to create an MDB for processing messages using a [EMAIL
PROTECTED] Processor}
*
* @version $Revision:520964 $
Modified:
activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
(original)
+++
activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
Sat May 5 01:41:50 2007
@@ -23,7 +23,7 @@
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.CamelClient;
+import org.apache.camel.CamelTemplate;
import org.apache.camel.examples.SendEmail;
import org.apache.camel.impl.DefaultCamelContext;
import static org.apache.camel.util.ServiceHelper.startServices;
@@ -45,10 +45,10 @@
public class JpaTest extends TestCase {
private static final transient Log log = LogFactory.getLog(JpaTest.class);
protected CamelContext camelContext = new DefaultCamelContext();
- protected CamelClient client = new CamelClient(camelContext);
+ protected CamelTemplate template = new CamelTemplate(camelContext);
protected JpaEndpoint endpoint;
protected TransactionStrategy transactionStrategy;
- protected JpaTemplate template;
+ protected JpaTemplate jpaTemplate;
protected Consumer<Exchange> consumer;
protected Exchange receivedExchange;
protected CountDownLatch latch = new CountDownLatch(1);
@@ -64,18 +64,18 @@
}
});
- List results = template.find(queryText);
+ List results = jpaTemplate.find(queryText);
assertEquals("Should have no results: " + results, 0, results.size());
// lets produce some objects
- client.send(endpoint, new Processor() {
+ template.send(endpoint, new Processor() {
public void process(Exchange exchange) {
exchange.getIn().setBody(new SendEmail("[EMAIL PROTECTED]"));
}
});
// now lets assert that there is a result
- results = template.find(queryText);
+ results = jpaTemplate.find(queryText);
assertEquals("Should have results: " + results, 1, results.size());
SendEmail mail = (SendEmail) results.get(0);
assertEquals("address property", "[EMAIL PROTECTED]",
mail.getAddress());
@@ -102,7 +102,7 @@
protected void setUp() throws Exception {
super.setUp();
- startServices(client, camelContext);
+ startServices(template, camelContext);
Endpoint value = camelContext.getEndpoint(getEndpointUri());
assertNotNull("Could not find endpoint!", value);
@@ -110,7 +110,7 @@
endpoint = (JpaEndpoint) value;
transactionStrategy = endpoint.createTransactionStrategy();
- template = endpoint.getTemplate();
+ jpaTemplate = endpoint.getTemplate();
}
protected String getEndpointUri() {
@@ -120,7 +120,7 @@
@Override
protected void tearDown() throws Exception {
- stopServices(consumer, client, camelContext);
+ stopServices(consumer, template, camelContext);
super.tearDown();
}
Modified:
activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
(original)
+++
activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
Sat May 5 01:41:50 2007
@@ -23,7 +23,7 @@
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.CamelClient;
+import org.apache.camel.CamelTemplate;
import org.apache.camel.examples.MultiSteps;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.util.ServiceHelper;
@@ -44,10 +44,10 @@
public class JpaWithNamedQueryTest extends TestCase {
private static final transient Log log =
LogFactory.getLog(JpaWithNamedQueryTest.class);
protected CamelContext camelContext = new DefaultCamelContext();
- protected CamelClient client = new CamelClient(camelContext);
+ protected CamelTemplate template = new CamelTemplate(camelContext);
protected JpaEndpoint endpoint;
protected TransactionStrategy transactionStrategy;
- protected JpaTemplate template;
+ protected JpaTemplate jpaTemplate;
protected Consumer<Exchange> consumer;
protected Exchange receivedExchange;
protected CountDownLatch latch = new CountDownLatch(1);
@@ -68,18 +68,18 @@
}
});
- List results = template.find(queryText);
+ List results = jpaTemplate.find(queryText);
assertEquals("Should have no results: " + results, 0, results.size());
// lets produce some objects
- client.send(endpoint, new Processor() {
+ template.send(endpoint, new Processor() {
public void process(Exchange exchange) {
exchange.getIn().setBody(new MultiSteps("[EMAIL PROTECTED]"));
}
});
// now lets assert that there is a result
- results = template.find(queryText);
+ results = jpaTemplate.find(queryText);
assertEquals("Should have results: " + results, 1, results.size());
MultiSteps mail = (MultiSteps) results.get(0);
assertEquals("address property", "[EMAIL PROTECTED]",
mail.getAddress());
@@ -135,7 +135,7 @@
protected void setUp() throws Exception {
super.setUp();
- ServiceHelper.startServices(client, camelContext);
+ ServiceHelper.startServices(template, camelContext);
Endpoint value = camelContext.getEndpoint(getEndpointUri());
assertNotNull("Could not find endpoint!", value);
@@ -143,7 +143,7 @@
endpoint = (JpaEndpoint) value;
transactionStrategy = endpoint.createTransactionStrategy();
- template = endpoint.getTemplate();
+ jpaTemplate = endpoint.getTemplate();
}
protected String getEndpointUri() {
@@ -153,7 +153,7 @@
@Override
protected void tearDown() throws Exception {
- ServiceHelper.stopServices(consumer, client, camelContext);
+ ServiceHelper.stopServices(consumer, template, camelContext);
super.tearDown();
}
Modified:
activemq/camel/trunk/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
(original)
+++
activemq/camel/trunk/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
Sat May 5 01:41:50 2007
@@ -18,10 +18,7 @@
package org.apache.camel.component.mail;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.component.mock.MockEndpoint;
-import static org.apache.camel.builder.Builder.constant;
import org.apache.camel.builder.RouteBuilder;
import static org.apache.camel.util.ObjectHelper.asString;
import org.jvnet.mock_javamail.Mailbox;
@@ -41,7 +38,7 @@
resultEndpoint = (MockEndpoint)
resolveMandatoryEndpoint("mock:result");
resultEndpoint.expectedBodiesReceived("hello world!");
- client.sendBody("smtp://[EMAIL PROTECTED]", "hello world!");
+ template.sendBody("smtp://[EMAIL PROTECTED]", "hello world!");
// lets test the first sent worked
assertMailboxReceivedMessages("[EMAIL PROTECTED]");
Modified:
activemq/camel/trunk/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java
(original)
+++
activemq/camel/trunk/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java
Sat May 5 01:41:50 2007
@@ -34,7 +34,7 @@
public void testSendMatchingMessage() throws Exception {
resultEndpoint.expectedMessageCount(1);
- client.sendBody("direct:start", "<person name='James'
city='London'/>");
+ template.sendBody("direct:start", "<person name='James'
city='London'/>");
resultEndpoint.assertIsSatisfied();
}
@@ -42,7 +42,7 @@
public void testSendNotMatchingMessage() throws Exception {
resultEndpoint.expectedMessageCount(0);
- client.sendBody("direct:start", "<person name='Hiram' city='Tampa'/>");
+ template.sendBody("direct:start", "<person name='Hiram'
city='Tampa'/>");
resultEndpoint.assertIsSatisfied();
Modified:
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/ContentBasedRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/ContentBasedRouteTest.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/ContentBasedRouteTest.java
(original)
+++
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/ContentBasedRouteTest.java
Sat May 5 01:41:50 2007
@@ -34,7 +34,7 @@
matchedEndpoint.expectedMessageCount(1);
notMatchedEndpoint.expectedMessageCount(0);
- client.sendBody("direct:start", body, header, "firstChoice");
+ template.sendBody("direct:start", body, header, "firstChoice");
assertIsSatisfied(matchedEndpoint, notMatchedEndpoint);
}
@@ -43,7 +43,7 @@
matchedEndpoint.expectedMessageCount(0);
notMatchedEndpoint.expectedMessageCount(1);
- client.sendBody("direct:start", body, header, "notMatchedValue");
+ template.sendBody("direct:start", body, header, "notMatchedValue");
assertIsSatisfied(matchedEndpoint, notMatchedEndpoint);
}
Modified:
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
(original)
+++
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
Sat May 5 01:41:50 2007
@@ -23,7 +23,7 @@
import org.apache.camel.Message;
import org.apache.camel.Route;
import org.apache.camel.spring.example.MyProcessor;
-import org.apache.camel.CamelClient;
+import org.apache.camel.CamelTemplate;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -43,8 +43,8 @@
assertValidContext(context);
// now lets send a message
- CamelClient<Exchange> client = new CamelClient<Exchange>(context);
- client.send("direct:start", new Processor() {
+ CamelTemplate<Exchange> template = new
CamelTemplate<Exchange>(context);
+ template.send("direct:start", new Processor() {
public void process(Exchange exchange) {
Message in = exchange.getIn();
in.setHeader("name", "James");
Modified:
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
(original)
+++
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
Sat May 5 01:41:50 2007
@@ -17,7 +17,7 @@
*/
package org.apache.camel.spring;
-import org.apache.camel.CamelClient;
+import org.apache.camel.CamelTemplate;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Route;
@@ -50,8 +50,8 @@
resultEndpoint.expectedBodiesReceived(body);
// now lets send a message
- CamelClient<Exchange> client = new CamelClient<Exchange>(camelContext);
- client.sendBody("direct:start", body);
+ CamelTemplate<Exchange> template = new
CamelTemplate<Exchange>(camelContext);
+ template.sendBody("direct:start", body);
resultEndpoint.assertIsSatisfied();
}
Modified:
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
(original)
+++
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
Sat May 5 01:41:50 2007
@@ -23,7 +23,7 @@
import org.apache.camel.TestSupport;
import org.apache.camel.Route;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.CamelClient;
+import org.apache.camel.CamelTemplate;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -46,8 +46,8 @@
resultEndpoint.expectedBodiesReceived(body);
// now lets send a message
- CamelClient<Exchange> client = new CamelClient<Exchange>(context);
- client.send("queue:start", new Processor() {
+ CamelTemplate<Exchange> template = new
CamelTemplate<Exchange>(context);
+ template.send("queue:start", new Processor() {
public void process(Exchange exchange) {
Message in = exchange.getIn();
in.setHeader("name", "James");
Modified:
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java?view=diff&rev=535478&r1=535477&r2=535478
==============================================================================
---
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
(original)
+++
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
Sat May 5 01:41:50 2007
@@ -20,7 +20,7 @@
import org.apache.camel.TestSupport;
import org.apache.camel.Route;
import org.apache.camel.Exchange;
-import org.apache.camel.CamelClient;
+import org.apache.camel.CamelTemplate;
import org.apache.camel.Endpoint;
import org.apache.camel.util.ObjectHelper;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -34,7 +34,7 @@
public abstract class SpringTestSupport extends TestSupport {
protected AbstractXmlApplicationContext applicationContext;
protected SpringCamelContext camelContext;
- protected CamelClient<Exchange> client;
+ protected CamelTemplate<Exchange> template;
protected abstract ClassPathXmlApplicationContext
createApplicationContext();
@@ -48,7 +48,7 @@
camelContext = createCamelContext();
assertValidContext(camelContext);
- client = new CamelClient<Exchange>(camelContext);
+ template = new CamelTemplate<Exchange>(camelContext);
}
@Override
