Author: hadrian
Date: Tue Jun 23 20:59:45 2009
New Revision: 787831
URL: http://svn.apache.org/viewvc?rev=787831&view=rev
Log:
CAMEL-1078. Removed the SpringIntegrationExchange.
Removed:
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationExchange.java
Modified:
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java
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=787831&r1=787830&r2=787831&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
Tue Jun 23 20:59:45 2009
@@ -16,6 +16,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.RuntimeCamelException;
@@ -84,7 +85,7 @@
}
public void handleMessage(org.springframework.integration.core.Message<?>
siInMessage) {
- SpringIntegrationExchange exchange = (SpringIntegrationExchange)
getEndpoint().createExchange();
+ Exchange exchange = getEndpoint().createExchange();
exchange.setIn(new SpringIntegrationMessage(siInMessage));
try {
getProcessor().process(exchange);
Modified:
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java?rev=787831&r1=787830&r2=787831&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
(original)
+++
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
Tue Jun 23 20:59:45 2009
@@ -22,6 +22,7 @@
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
+import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.impl.ScheduledPollEndpoint;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,6 +35,7 @@
*/
public class SpringIntegrationEndpoint extends ScheduledPollEndpoint {
private static final Log LOG =
LogFactory.getLog(SpringIntegrationEndpoint.class);
+
private String inputChannel;
private String outputChannel;
private String defaultChannel;
@@ -68,7 +70,7 @@
}
public Exchange createExchange(ExchangePattern pattern) {
- return new SpringIntegrationExchange(this, pattern);
+ return new DefaultExchange(this, pattern);
}
public void setInputChannel(String input) {
Modified:
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java?rev=787831&r1=787830&r2=787831&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java
(original)
+++
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java
Tue Jun 23 20:59:45 2009
@@ -68,12 +68,6 @@
}
}
- @Override
- public SpringIntegrationExchange getExchange() {
- return (SpringIntegrationExchange)super.getExchange();
- }
-
-
public Object getHeader(String name) {
if (siMessage != null) {
return siMessage.getHeaders().get(name);
@@ -100,5 +94,4 @@
protected Object createBody() {
return siMessage.getPayload();
}
-
}
Modified:
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java?rev=787831&r1=787830&r2=787831&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java
(original)
+++
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java
Tue Jun 23 20:59:45 2009
@@ -21,8 +21,8 @@
import org.apache.camel.ExchangePattern;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.spring.integration.SpringIntegrationBinding;
-import org.apache.camel.component.spring.integration.SpringIntegrationExchange;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.impl.DefaultExchange;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.core.Message;
@@ -74,7 +74,7 @@
} else {
pattern = ExchangePattern.InOnly;
}
- Exchange inExchange = new SpringIntegrationExchange(this, pattern);
+ Exchange inExchange = new DefaultExchange(getCamelContext(), pattern);
SpringIntegrationBinding.storeToCamelMessage(message,
inExchange.getIn());
Exchange outExchange = getCamelTemplate().send(getCamelEndpointUri(),
inExchange);
if (outExchange.getFault() != null) {
