You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2008/11/10 00:55:17 UTC
svn commit: r712585 - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/component/file/
camel-core/src/main/java/org/apache/camel/component/jmx/
camel-core/src/main/java/org/apache/camel/impl...
Author: hadrian
Date: Sun Nov 9 15:55:17 2008
New Revision: 712585
URL: http://svn.apache.org/viewvc?rev=712585&view=rev
Log:
CAMEL-872. Removed need for generics in Endpoint. Endpoint still uses generics though. This change is rather large and will be fixed in a few stages.
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProducer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProducerTest.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpProducer.java
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java
activemq/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
activemq/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiConsumer.java
activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java Sun Nov 9 15:55:17 2008
@@ -47,7 +47,7 @@
/**
* Create a new exchange for communicating with this endpoint
*/
- E createExchange();
+ Exchange createExchange();
/**
* Create a new exchange for communicating with this endpoint
@@ -56,13 +56,13 @@
*
* @param pattern the message exchange pattern for the exchange
*/
- E createExchange(ExchangePattern pattern);
+ Exchange createExchange(ExchangePattern pattern);
/**
* Creates a new exchange for communicating with this exchange using the
* given exchange to pre-populate the values of the headers and messages
*/
- E createExchange(Exchange exchange);
+ Exchange createExchange(Exchange exchange);
/**
* Returns the context which created the endpoint
@@ -129,5 +129,4 @@
* Most endpoints is configued to be <b>not</b> lenient.
*/
boolean isLenientProperties();
-
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java Sun Nov 9 15:55:17 2008
@@ -23,6 +23,7 @@
import java.util.Map;
import org.apache.camel.Consumer;
+import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Expression;
import org.apache.camel.Message;
@@ -105,12 +106,12 @@
}
@Override
- public FileExchange createExchange() {
+ public Exchange createExchange() {
return createExchange(getFile());
}
@Override
- public FileExchange createExchange(ExchangePattern pattern) {
+ public Exchange createExchange(ExchangePattern pattern) {
return new FileExchange(getCamelContext(), pattern, file);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProducer.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProducer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProducer.java Sun Nov 9 15:55:17 2008
@@ -57,7 +57,7 @@
}
public void process(Exchange exchange) throws Exception {
- FileExchange fileExchange = endpoint.createExchange(exchange);
+ FileExchange fileExchange = (FileExchange) endpoint.createExchange(exchange);
process(fileExchange);
ExchangeHelper.copyResults(exchange, fileExchange);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java Sun Nov 9 15:55:17 2008
@@ -22,6 +22,7 @@
import javax.management.monitor.CounterMonitor;
import org.apache.camel.Consumer;
+import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -94,11 +95,11 @@
return new JMXExchange(getCamelContext(), getExchangePattern(), notification);
}
- public JMXExchange createExchange() {
+ public Exchange createExchange() {
return new JMXExchange(getCamelContext(), getExchangePattern(), null);
}
- public JMXExchange createExchange(ExchangePattern pattern) {
+ public Exchange createExchange(ExchangePattern pattern) {
return new JMXExchange(getCamelContext(), pattern, null);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java Sun Nov 9 15:55:17 2008
@@ -134,14 +134,14 @@
return getCamelContext().getExchangeConverter().convertTo(type, exchange);
}
- public E createExchange(Exchange exchange) {
+ public Exchange createExchange(Exchange exchange) {
Class<E> exchangeType = getExchangeType();
if (exchangeType != null) {
if (exchangeType.isInstance(exchange)) {
return exchangeType.cast(exchange);
}
}
- E answer = createExchange();
+ E answer = (E) createExchange();
answer.copyFrom(exchange);
return answer;
}
@@ -164,11 +164,11 @@
return null;
}
- public E createExchange() {
+ public Exchange createExchange() {
return createExchange(getExchangePattern());
}
- public E createExchange(ExchangePattern pattern) {
+ public Exchange createExchange(ExchangePattern pattern) {
return (E) new DefaultExchange(getCamelContext(), pattern);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java Sun Nov 9 15:55:17 2008
@@ -43,15 +43,15 @@
}
public E createExchange() {
- return endpoint.createExchange();
+ return (E) endpoint.createExchange();
}
public E createExchange(ExchangePattern pattern) {
- return endpoint.createExchange(pattern);
+ return (E) endpoint.createExchange(pattern);
}
public E createExchange(E exchange) {
- return endpoint.createExchange(exchange);
+ return (E) endpoint.createExchange(exchange);
}
protected void doStart() throws Exception {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java Sun Nov 9 15:55:17 2008
@@ -53,7 +53,7 @@
Message out = exchange.getOut(false);
if (out != null) {
// lets create a new exchange
- E newExchange = getEndpoint().createExchange();
+ E newExchange = (E) getEndpoint().createExchange();
newExchange.getIn().copyFrom(out);
exchange = newExchange;
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProducerTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProducerTest.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProducerTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProducerTest.java Sun Nov 9 15:55:17 2008
@@ -46,8 +46,7 @@
return null;
}
-
- public MyExchange createExchange(ExchangePattern pattern) {
+ public Exchange createExchange(ExchangePattern pattern) {
return new MyExchange(getCamelContext(), pattern);
}
@@ -58,7 +57,6 @@
public boolean isSingleton() {
return false;
}
-
};
DefaultProducer producer = new DefaultProducer(endpoint) {
@@ -71,15 +69,15 @@
Exchange exchange = new DefaultExchange(context);
producer.process(exchange);
- Class type = endpoint.getExchangeType();
+ Class<?> type = endpoint.getExchangeType();
assertEquals("exchange type", MyExchange.class, type);
- MyExchange actual = endpoint.createExchange(exchange);
+ MyExchange actual = (MyExchange) endpoint.createExchange(exchange);
assertNotNull(actual);
assertTrue("Not same exchange", actual != exchange);
MyExchange expected = new MyExchange(context, pattern);
- actual = endpoint.createExchange(expected);
+ actual = (MyExchange) endpoint.createExchange(expected);
assertSame("Should not copy an exchange when of the correct type", expected, actual);
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java Sun Nov 9 15:55:17 2008
@@ -17,6 +17,7 @@
package org.apache.camel.component.cxf;
import org.apache.camel.Consumer;
+import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -78,11 +79,11 @@
return new CxfConsumer(this, processor);
}
- public CxfExchange createExchange() {
+ public Exchange createExchange() {
return new CxfExchange(getCamelContext(), getExchangePattern());
}
- public CxfExchange createExchange(ExchangePattern pattern) {
+ public Exchange createExchange(ExchangePattern pattern) {
return new CxfExchange(getCamelContext(), pattern);
}
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java Sun Nov 9 15:55:17 2008
@@ -162,7 +162,7 @@
}
public void process(Exchange exchange) throws Exception {
- CxfExchange cxfExchange = endpoint.createExchange(exchange);
+ CxfExchange cxfExchange = (CxfExchange) endpoint.createExchange(exchange);
process(cxfExchange);
exchange.copyFrom(cxfExchange);
Modified: activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java Sun Nov 9 15:55:17 2008
@@ -40,5 +40,4 @@
configureConsumer(consumer);
return consumer;
}
-
}
Modified: activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpProducer.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpProducer.java (original)
+++ activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpProducer.java Sun Nov 9 15:55:17 2008
@@ -48,7 +48,7 @@
throw new FtpOperationFailedException(client.getReplyCode(), client.getReplyString(), message);
}
- process(endpoint.createExchange(exchange));
+ process((RemoteFileExchange)endpoint.createExchange(exchange));
} catch (Exception e) {
loggedIn = false;
if (isStopping() || isStopped()) {
Modified: activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java Sun Nov 9 15:55:17 2008
@@ -18,6 +18,7 @@
import java.io.ByteArrayOutputStream;
+import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
import org.apache.camel.impl.ScheduledPollEndpoint;
@@ -45,11 +46,11 @@
return new RemoteFileBinding();
}
- public T createExchange() {
+ public Exchange createExchange() {
return (T) new RemoteFileExchange(getCamelContext(), getExchangePattern(), getBinding());
}
- public T createExchange(ExchangePattern pattern) {
+ public Exchange createExchange(ExchangePattern pattern) {
return (T) new RemoteFileExchange(getCamelContext(), pattern, getBinding());
}
Modified: activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java Sun Nov 9 15:55:17 2008
@@ -22,6 +22,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.PollingConsumer;
import org.apache.camel.Producer;
@@ -69,7 +70,7 @@
return new HttpPollingConsumer(this);
}
- public HttpExchange createExchange(ExchangePattern pattern) {
+ public Exchange createExchange(ExchangePattern pattern) {
return new HttpExchange(this, pattern);
}
Modified: activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java (original)
+++ activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java Sun Nov 9 15:55:17 2008
@@ -54,7 +54,7 @@
}
public HttpExchange receiveNoWait() {
- HttpExchange exchange = endpoint.createExchange();
+ HttpExchange exchange = (HttpExchange) endpoint.createExchange();
HttpMethod method = createMethod();
try {
Modified: activemq/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java Sun Nov 9 15:55:17 2008
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.irc;
+import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultEndpoint;
@@ -42,7 +43,7 @@
return true;
}
- public IrcExchange createExchange(ExchangePattern pattern) {
+ public Exchange createExchange(ExchangePattern pattern) {
return new IrcExchange(getCamelContext(), pattern, getBinding());
}
Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java Sun Nov 9 15:55:17 2008
@@ -20,6 +20,7 @@
import javax.jms.TemporaryQueue;
import javax.jms.TemporaryTopic;
+import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.HeaderFilterStrategyAware;
import org.apache.camel.PollingConsumer;
@@ -114,7 +115,7 @@
}
@Override
- public JmsExchange createExchange(ExchangePattern pattern) {
+ public Exchange createExchange(ExchangePattern pattern) {
return new JmsExchange(getCamelContext(), pattern, getBinding());
}
Modified: activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java Sun Nov 9 15:55:17 2008
@@ -19,6 +19,7 @@
import javax.mail.Message;
import org.apache.camel.Consumer;
+import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -88,7 +89,7 @@
@Override
- public MailExchange createExchange(ExchangePattern pattern) {
+ public Exchange createExchange(ExchangePattern pattern) {
return new MailExchange(getCamelContext(), pattern, getBinding());
}
Modified: activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java Sun Nov 9 15:55:17 2008
@@ -20,6 +20,7 @@
import java.nio.charset.Charset;
import org.apache.camel.Consumer;
+import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -80,7 +81,7 @@
}
@Override
- public MinaExchange createExchange(ExchangePattern pattern) {
+ public Exchange createExchange(ExchangePattern pattern) {
return new MinaExchange(getCamelContext(), pattern, null);
}
Modified: activemq/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java Sun Nov 9 15:55:17 2008
@@ -20,6 +20,7 @@
import java.util.Map;
import java.util.Set;
+import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -123,7 +124,7 @@
}
@Override
- public QuartzExchange createExchange(ExchangePattern pattern) {
+ public Exchange createExchange(ExchangePattern pattern) {
return new QuartzExchange(getCamelContext(), pattern, null);
}
Modified: activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiConsumer.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiConsumer.java (original)
+++ activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiConsumer.java Sun Nov 9 15:55:17 2008
@@ -86,7 +86,7 @@
throw new IllegalStateException("The endpoint is not active: " + getEndpoint().getEndpointUri());
}
BeanInvocation invocation = new BeanInvocation(method, args);
- BeanExchange exchange = getEndpoint().createExchange();
+ BeanExchange exchange = (BeanExchange) getEndpoint().createExchange();
exchange.setInvocation(invocation);
getProcessor().process(exchange);
Throwable fault = exchange.getException();
Modified: activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java Sun Nov 9 15:55:17 2008
@@ -25,6 +25,7 @@
import java.util.List;
import org.apache.camel.Consumer;
+import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -58,7 +59,7 @@
}
@Override
- public BeanExchange createExchange(ExchangePattern pattern) {
+ public Exchange createExchange(ExchangePattern pattern) {
return new BeanExchange(getCamelContext(), pattern);
}
Modified: activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java (original)
+++ activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java Sun Nov 9 15:55:17 2008
@@ -88,7 +88,7 @@
}
public void handleMessage(org.springframework.integration.core.Message<?> siInMessage) {
- SpringIntegrationExchange exchange = getEndpoint().createExchange();
+ SpringIntegrationExchange exchange = (SpringIntegrationExchange) getEndpoint().createExchange();
exchange.setIn(new SpringIntegrationMessage(siInMessage));
try {
getProcessor().process(exchange);
Modified: activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java Sun Nov 9 15:55:17 2008
@@ -18,6 +18,7 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Consumer;
+import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -63,11 +64,11 @@
return new SpringIntegrationConsumer(this, processor);
}
- public SpringIntegrationExchange createExchange() {
+ public Exchange createExchange() {
return createExchange(getExchangePattern());
}
- public SpringIntegrationExchange createExchange(ExchangePattern pattern) {
+ public Exchange createExchange(ExchangePattern pattern) {
return new SpringIntegrationExchange(getCamelContext(), pattern);
}
Modified: activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java?rev=712585&r1=712584&r2=712585&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java Sun Nov 9 15:55:17 2008
@@ -20,6 +20,7 @@
import org.apache.camel.CamelException;
import org.apache.camel.Consumer;
+import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -87,7 +88,7 @@
}
@Override
- public XmppExchange createExchange(ExchangePattern pattern) {
+ public Exchange createExchange(ExchangePattern pattern) {
return new XmppExchange(getCamelContext(), pattern, getBinding());
}