You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2009/09/07 16:30:29 UTC
svn commit: r812152 - in
/servicemix/components/engines/servicemix-camel/trunk: ./
src/main/java/org/apache/servicemix/camel/
src/main/java/org/apache/servicemix/camel/osgi/
src/test/java/org/apache/servicemix/camel/
src/test/java/org/apache/servicemix...
Author: gertv
Date: Mon Sep 7 14:30:27 2009
New Revision: 812152
URL: http://svn.apache.org/viewvc?rev=812152&view=rev
Log:
SMXCOMP-563: Upgrade servicemix-camel to Camel 2.0
Removed:
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiExchange.java
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiMessage.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiExchangeTest.java
Modified:
servicemix/components/engines/servicemix-camel/trunk/pom.xml
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelConsumerEndpoint.java
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelJbiComponent.java
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelSpringDeployer.java
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiBinding.java
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiComponent.java
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/CamelConsumerEndpointTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiBindingTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiEndpointWithMepSpecifiedTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyAsyncCamelTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyCamelErrorHandlingTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyPropertiesPipelineTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyWithErrorHandledTrueSpringDSLTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyWithFaultHandledTrueSpringDSLTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutCamelErrorHandlingTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutFromCamelRoute.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutWithPojoTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiOperationCamelTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiTestSupport.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiToCamelCbrTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/NonJbiCamelEndpointsIntegrationTest.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/TestCamelRouter.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/su7/MyRouter.java
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su1-src/camel-context.xml
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su10-src/camel-context.xml
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su2-src/camel-context.xml
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su3-src/camel-context.xml
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su4-src/camel-context.xml
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su5-src/camel-context.xml
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su6-src/camel-context.xml
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su7-src/camel-context.xml
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su8-src/camel-context.xml
servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su9-src/camel-context.xml
Modified: servicemix/components/engines/servicemix-camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/pom.xml?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/pom.xml Mon Sep 7 14:30:27 2009
@@ -38,7 +38,7 @@
<properties>
<previous.releases>3.1.2,3.2,3.2.1,3.2.2,3.2.3,2008.01</previous.releases>
- <camel-version>1.6.2-SNAPSHOT</camel-version>
+ <camel-version>2.0.0</camel-version>
<servicemix-version>3.3.1</servicemix-version>
<servicemix-shared-version>2009.02-SNAPSHOT</servicemix-shared-version>
<servicemix.osgi.import>
Modified: servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelConsumerEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelConsumerEndpoint.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelConsumerEndpoint.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelConsumerEndpoint.java Mon Sep 7 14:30:27 2009
@@ -16,10 +16,7 @@
*/
package org.apache.servicemix.camel;
-import java.net.URISyntaxException;
-import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
import javax.jbi.management.DeploymentException;
import javax.jbi.messaging.ExchangeStatus;
@@ -28,10 +25,7 @@
import javax.jbi.messaging.NormalizedMessage;
import javax.xml.namespace.QName;
-import org.apache.camel.AsyncCallback;
-import org.apache.camel.AsyncProcessor;
import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
import org.apache.servicemix.common.endpoints.ConsumerEndpoint;
import org.apache.servicemix.common.util.URIResolver;
@@ -42,17 +36,14 @@
* A consumer endpoint that will be used to send JBI exchanges
* originating from camel.
*/
-public class CamelConsumerEndpoint extends ConsumerEndpoint implements AsyncProcessor {
+public class CamelConsumerEndpoint extends ConsumerEndpoint {
- public static final QName SERVICE_NAME = new QName("http://activemq.apache.org/camel/schema/jbi", "consumer");
+ public static final QName SERVICE_NAME = new QName("http://camel.apache.org/schema/jbi", "provider");
private JbiBinding binding;
private JbiEndpoint jbiEndpoint;
- private Map<String, AsyncCallback> callbacks = new ConcurrentHashMap<String, AsyncCallback>();
- private Map<String, Exchange> exchanges = new ConcurrentHashMap<String, Exchange>();
-
public CamelConsumerEndpoint(JbiBinding binding, JbiEndpoint jbiEndpoint) {
setService(SERVICE_NAME);
setEndpoint(new IdGenerator().generateId());
@@ -60,45 +51,9 @@
this.jbiEndpoint = jbiEndpoint;
}
- public void process(MessageExchange messageExchange) throws Exception {
- Exchange exchange = exchanges.remove(messageExchange.getExchangeId());
- if (exchange == null) {
- String message = String.format("Unable to find Camel Exchange for JBI MessageExchange %s", messageExchange.getExchangeId());
- logger.warn(message);
- if (messageExchange.getStatus() == ExchangeStatus.ACTIVE) {
- fail(messageExchange, new JbiException(message));
- }
- } else {
- processReponse(messageExchange, exchange);
- }
-
- AsyncCallback asyncCallback = callbacks.remove(messageExchange.getExchangeId());
- if (asyncCallback == null) {
- logger.warn(String.format("Unable to find Camel AsyncCallback for JBI MessageExchange %s", messageExchange.getExchangeId()));
- } else {
- asyncCallback.done(false);
- }
- }
-
- public boolean process(Exchange exchange, AsyncCallback asyncCallback) {
- try {
- MessageExchange messageExchange = binding.makeJbiMessageExchange(exchange, getExchangeFactory(), jbiEndpoint.getMep());
-
- if (jbiEndpoint.getOperation() != null) {
- messageExchange.setOperation(QName.valueOf(jbiEndpoint.getOperation()));
- }
-
- URIResolver.configureExchange(messageExchange, getContext(), jbiEndpoint.getDestinationUri());
- exchanges.put(messageExchange.getExchangeId(), exchange);
- callbacks.put(messageExchange.getExchangeId(), asyncCallback);
-
- send(messageExchange);
- return false;
- } catch (Exception e) {
- exchange.setException(e);
- asyncCallback.done(true);
- return true;
- }
+ public void process(MessageExchange exchange) throws Exception {
+ // we don't expect any asynchronous MessageExchange callbacks because we're using sendSync
+ logger.error("Unexpected MessageExchange received: " + exchange);
}
public void process(Exchange exchange) throws Exception {
@@ -106,7 +61,7 @@
MessageExchange messageExchange = binding.makeJbiMessageExchange(exchange, getExchangeFactory(), jbiEndpoint.getMep());
if (jbiEndpoint.getOperation() != null) {
- messageExchange.setOperation(QName.valueOf(jbiEndpoint.getOperation()));
+ messageExchange.setOperation(jbiEndpoint.getOperation());
}
URIResolver.configureExchange(messageExchange, getContext(), jbiEndpoint.getDestinationUri());
@@ -118,10 +73,7 @@
} catch (MessagingException e) {
exchange.setException(e);
throw new JbiException(e);
- } catch (URISyntaxException e) {
- exchange.setException(e);
- throw new JbiException(e);
- }
+ }
}
private void processReponse(MessageExchange messageExchange, Exchange exchange) throws MessagingException {
@@ -130,10 +82,11 @@
} else if (messageExchange.getStatus() == ExchangeStatus.ACTIVE) {
addHeaders(messageExchange, exchange);
if (messageExchange.getFault() != null) {
- exchange.getFault().setBody(new FaultException("Fault occured for " + exchange.getPattern() + " exchange",
+ exchange.getOut().setBody(new FaultException("Fault occured for " + exchange.getPattern() + " exchange",
messageExchange, messageExchange.getFault()));
- addHeaders(messageExchange.getFault(), exchange.getFault());
- addAttachments(messageExchange.getFault(), exchange.getFault());
+ exchange.getOut().setFault(true);
+ addHeaders(messageExchange.getFault(), exchange.getOut());
+ addAttachments(messageExchange.getFault(), exchange.getOut());
} else if (messageExchange.getMessage("out") != null) {
exchange.getOut().setBody(messageExchange.getMessage("out").getContent());
addHeaders(messageExchange.getMessage("out"), exchange.getOut());
Modified: servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelJbiComponent.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelJbiComponent.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelJbiComponent.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelJbiComponent.java Mon Sep 7 14:30:27 2009
@@ -67,7 +67,7 @@
* @return Class[]
* @see org.apache.servicemix.common.DefaultComponent#getEndpointClasses()
*/
- @Override
+ @Override @SuppressWarnings("unchecked")
protected Class[] getEndpointClasses() {
return new Class[] {CamelProviderEndpoint.class, CamelConsumerEndpoint.class};
}
@@ -110,6 +110,7 @@
return endpoint;
}
+ @SuppressWarnings("unchecked")
public CamelProviderEndpoint createEndpoint(String uriString, JbiComponent jbiComponent) throws URISyntaxException {
URI uri = new URI(uriString);
Map map = URISupport.parseQuery(uri.getQuery());
@@ -120,9 +121,6 @@
IntrospectionSupport.setProperties(endpoint, map);
- // TODO
- // endpoint.setRole(MessageExchange.Role.PROVIDER);
-
return endpoint;
}
Modified: servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java Mon Sep 7 14:30:27 2009
@@ -16,7 +16,6 @@
*/
package org.apache.servicemix.camel;
-
import javax.jbi.messaging.ExchangeStatus;
import javax.jbi.messaging.Fault;
import javax.jbi.messaging.InOnly;
@@ -29,6 +28,7 @@
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.spi.Synchronization;
import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.common.ServiceUnit;
import org.apache.servicemix.common.endpoints.ProviderEndpoint;
@@ -39,9 +39,9 @@
*
* @version $Revision: 426415 $
*/
-public class CamelProviderEndpoint extends ProviderEndpoint {
+public class CamelProviderEndpoint extends ProviderEndpoint implements Synchronization {
- public static final QName SERVICE_NAME = new QName("http://activemq.apache.org/camel/schema/jbi", "provider");
+ public static final QName SERVICE_NAME = new QName("http://camel.apache.org/schema/jbi", "provider");
private JbiBinding binding;
@@ -90,12 +90,8 @@
logger.debug("Received exchange: " + exchange);
}
Exchange camelExchange = binding.createExchange(exchange);
+ camelExchange.addOnCompletion(this);
camelProcessor.process(camelExchange);
- if (camelExchange.isFailed()) {
- handleFailure(exchange, camelExchange);
- } else {
- handleSuccess(exchange, camelExchange);
- }
// This is not compliant with the default MEPs
} else {
throw new IllegalStateException("Provider exchange is ACTIVE, but no in or fault is provided");
@@ -103,46 +99,6 @@
}
/*
- * Handle successful camel invocation
- */
- private void handleSuccess(MessageExchange exchange, Exchange camelExchange) throws MessagingException {
- binding.copyFromCamelToJbi(camelExchange, exchange);
- if (exchange instanceof InOnly || exchange instanceof RobustInOnly) {
- done(exchange);
- } else {
- doSend(exchange);
- }
- }
-
- /*
- * Handle failure during camel route invocation
- */
- private void handleFailure(MessageExchange exchange, Exchange camelExchange) throws MessagingException {
- if (camelExchange.getFault(false) == null || camelExchange.getFault(false).getBody() == null) {
- Throwable t = camelExchange.getException();
- Exception e;
- if (t == null) {
- e = new Exception("Unknown error");
- } else if (t instanceof Exception) {
- e = (Exception) t;
- } else {
- e = new Exception(t);
- }
- fail(exchange, e);
- } else {
- Fault fault = exchange.createFault();
- fault.setContent(camelExchange.getFault().getBody(Source.class));
- if (isFaultCapable(exchange)) {
- exchange.setFault(fault);
- doSend(exchange);
- } else {
- // MessageExchange is not capable of conveying faults -- sending the information as an error instead
- fail(exchange, new FaultException("Fault occured for " + exchange.getPattern() + " exchange", exchange, fault));
- }
- }
- }
-
- /*
* Check if the exchange is capable of conveying fault messages
*/
private boolean isFaultCapable(MessageExchange exchange) {
@@ -160,4 +116,48 @@
send(exchange);
}
}
+
+ public void onComplete(Exchange exchange) {
+ MessageExchange me = JbiBinding.getMessageExchange(exchange);
+ try {
+ binding.copyFromCamelToJbi(exchange, me);
+ if (me instanceof InOnly || me instanceof RobustInOnly) {
+ done(me);
+ } else {
+ doSend(me);
+ }
+ } catch (MessagingException e) {
+ logger.warn("Unable to send JBI MessageExchange after successful Camel route invocation: " + me, e);
+ }
+ }
+
+ public void onFailure(Exchange exchange) {
+ MessageExchange me = JbiBinding.getMessageExchange(exchange);
+ try {
+ if (exchange.hasOut()) {
+ Fault fault = me.createFault();
+ fault.setContent(exchange.getOut().getBody(Source.class));
+ if (isFaultCapable(me)) {
+ me.setFault(fault);
+ doSend(me);
+ } else {
+ // MessageExchange is not capable of conveying faults -- sending the information as an error instead
+ fail(me, new FaultException("Fault occured for " + exchange.getPattern() + " exchange", me, fault));
+ }
+ } else {
+ Throwable t = exchange.getException();
+ Exception e;
+ if (t == null) {
+ e = new Exception("Unknown error");
+ } else if (t instanceof Exception) {
+ e = (Exception) t;
+ } else {
+ e = new Exception(t);
+ }
+ fail(me, e);
+ }
+ } catch (MessagingException e) {
+ logger.warn("Unable to send JBI MessageExchange after successful Camel route invocation: " + me, e);
+ }
+ }
}
Modified: servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelSpringDeployer.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelSpringDeployer.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelSpringDeployer.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelSpringDeployer.java Mon Sep 7 14:30:27 2009
@@ -115,6 +115,7 @@
return services;
}
+ @SuppressWarnings("unchecked")
protected Map getParentBeansMap() {
Map beans = super.getParentBeansMap();
beans.put("servicemix-camel", component);
Modified: servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiBinding.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiBinding.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiBinding.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiBinding.java Mon Sep 7 14:30:27 2009
@@ -37,7 +37,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
-import org.apache.camel.NoTypeConversionAvailableException;
+import org.apache.camel.impl.DefaultExchange;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -52,9 +52,6 @@
public static final String OPERATION = "JbiOperation";
public static final String SECURITY_SUBJECT = "JbiSecuritySubject";
- @Deprecated
- public static final String OPERATION_STRING = "jbi.operation";
-
private static final Log LOG = LogFactory.getLog(JbiBinding.class);
private final CamelContext context;
@@ -69,6 +66,9 @@
throws MessagingException, URISyntaxException {
MessageExchange jbiExchange = createJbiMessageExchange(camelExchange, exchangeFactory, defaultMep);
+
+ copyHeadersFromCamelToJbi(camelExchange, jbiExchange);
+
NormalizedMessage normalizedMessage = jbiExchange.getMessage("in");
if (normalizedMessage == null) {
normalizedMessage = jbiExchange.createMessage();
@@ -102,40 +102,23 @@
answer = exchangeFactory.createExchange(new URI(mep.toString()));
}
}
- // TODO: this is not really usefull as the out will not be
- // TODO: populated at that time
- if (answer == null) {
- // lets try choose the best MEP based on the camel message
- Message out = camelExchange.getOut(false);
- if (out == null || out.getBody() == null) {
- answer = exchangeFactory.createInOnlyExchange();
- } else {
- answer = exchangeFactory.createInOutExchange();
- }
- }
if (getOperation(camelExchange) != null) {
answer.setOperation(getOperation(camelExchange));
}
-
- // let's try to use the old way too
- if (answer.getOperation() == null && camelExchange.getProperties().containsKey(JbiBinding.OPERATION_STRING)) {
- answer.setOperation(QName.valueOf(camelExchange.getProperty(JbiBinding.OPERATION_STRING, String.class)));
- }
return answer;
}
public Exchange createExchange(MessageExchange exchange) {
- Exchange result = new JbiExchange(context, this);
+ Exchange result = new DefaultExchange(context);
result.setProperty(MESSAGE_EXCHANGE, exchange);
result.setPattern(getExchangePattern(exchange));
if (exchange.getOperation() != null) {
result.setProperty(OPERATION, exchange.getOperation());
- result.setProperty(OPERATION_STRING, exchange.getOperation().toString());
}
if (exchange.getMessage("in") != null) {
- copyJbiToCamel(exchange.getMessage("in"), result.getIn());
+ copyFromJbiToCamel(exchange.getMessage("in"), result.getIn());
}
return result;
}
@@ -155,7 +138,13 @@
}
}
- private void copyJbiToCamel(NormalizedMessage from, Message to) {
+ /**
+ * Copies content, headers, security subject and attachments from the JBI NormalizedMessage to the Camel Message.
+ *
+ * @param from the source {@link NormalizedMessage}
+ * @param to the target {@link Message}
+ */
+ public void copyFromJbiToCamel(NormalizedMessage from, Message to) {
to.setBody(from.getContent());
if (from.getSecuritySubject() != null) {
to.setHeader(SECURITY_SUBJECT, from.getSecuritySubject());
@@ -169,10 +158,12 @@
}
public void copyFromCamelToJbi(Message message, NormalizedMessage normalizedMessage) throws MessagingException {
- try {
- normalizedMessage.setContent(message.getBody(Source.class));
- } catch (NoTypeConversionAvailableException e) {
- LOG.warn("Unable to convert message body of type " + message.getBody().getClass() + " into an XML Source");
+ if (message != null && message.getBody() != null) {
+ if (message.getBody(Source.class) == null) {
+ LOG.warn("Unable to convert message body of type " + message.getBody().getClass() + " into an XML Source");
+ } else {
+ normalizedMessage.setContent(message.getBody(Source.class));
+ }
}
if (getSecuritySubject(message) != null) {
@@ -192,25 +183,36 @@
}
public void copyFromCamelToJbi(Exchange exchange, MessageExchange messageExchange) throws MessagingException {
+ // add Exchange properties to the MessageExchange without overwriting any existing properties
+ copyHeadersFromCamelToJbi(exchange, messageExchange);
+
NormalizedMessage in = messageExchange.getMessage("in");
for (String key : exchange.getIn().getHeaders().keySet()) {
in.setProperty(key, exchange.getIn().getHeader(key));
}
if (isOutCapable(messageExchange)) {
- if (exchange.getOut(false) == null) {
- //JBI MEP requires a reply and the Camel exchange failed to produce one -- echoing back the request
+ if (exchange.hasOut()) {
NormalizedMessage out = messageExchange.createMessage();
- copyFromCamelToJbi(exchange.getIn(), out);
+ copyFromCamelToJbi(exchange.getOut(), out);
messageExchange.setMessage(out, "out");
} else {
+ //JBI MEP requires a reply and the Camel exchange failed to produce one -- echoing back the request
NormalizedMessage out = messageExchange.createMessage();
- copyFromCamelToJbi(exchange.getOut(), out);
+ copyFromCamelToJbi(exchange.getIn(), out);
messageExchange.setMessage(out, "out");
}
}
}
+ private void copyHeadersFromCamelToJbi(Exchange exchange, MessageExchange messageExchange) {
+ for (String key : exchange.getProperties().keySet()) {
+ if (messageExchange.getProperty(key) == null) {
+ messageExchange.setProperty(key, exchange.getProperty(key));
+ }
+ }
+ }
+
private boolean isOutCapable(MessageExchange exchange) {
return exchange instanceof InOut || exchange instanceof InOptionalOut;
}
Modified: servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiComponent.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiComponent.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiComponent.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiComponent.java Mon Sep 7 14:30:27 2009
@@ -21,13 +21,13 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
import org.apache.camel.FailedToCreateProducerException;
import org.apache.camel.Processor;
+import org.apache.camel.processor.UnitOfWorkProcessor;
import org.apache.servicemix.common.util.URIResolver;
import org.apache.servicemix.id.IdGenerator;
-public class JbiComponent implements Component<Exchange> {
+public class JbiComponent implements Component {
private CamelComponent camelJbiComponent;
private JbiBinding binding;
@@ -51,10 +51,9 @@
camelContext = context;
}
- public void setCamelJbiComponent(CamelComponent component) {
+ public final void setCamelJbiComponent(CamelComponent component) {
this.camelJbiComponent = component;
this.camelJbiComponent.addJbiComponent(this);
-
}
public CamelComponent getCamelJbiComponent() {
@@ -89,9 +88,12 @@
// Resolve Camel Endpoints
// -------------------------------------------------------------------------
- public Endpoint<Exchange> createEndpoint(String uri) {
+ public Endpoint createEndpoint(String uri) {
if (uri.startsWith("jbi:")) {
uri = uri.substring("jbi:".length());
+ if (uri.startsWith("//")) {
+ uri = uri.substring("//".length());
+ }
return new JbiEndpoint(this, uri);
}
return null;
@@ -171,13 +173,10 @@
protected Processor createCamelProcessor(Endpoint camelEndpoint) {
Processor processor = null;
try {
- processor = camelEndpoint.createProducer();
+ processor = new UnitOfWorkProcessor(camelEndpoint.createProducer());
} catch (Exception e) {
throw new FailedToCreateProducerException(camelEndpoint, e);
}
return processor;
}
-
-
-
}
Modified: servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java Mon Sep 7 14:30:27 2009
@@ -19,32 +19,33 @@
import java.net.URISyntaxException;
import java.util.Map;
+import javax.xml.namespace.QName;
+
import org.apache.camel.Consumer;
+import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.AsyncProcessor;
-import org.apache.camel.AsyncCallback;
-import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultConsumer;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.impl.DefaultProducer;
import org.apache.camel.util.URISupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.util.StringUtils;
/**
* Represents an {@link org.apache.camel.Endpoint} for interacting with JBI
*
* @version $Revision: 563665 $
*/
-public class JbiEndpoint extends DefaultEndpoint<Exchange> {
+public class JbiEndpoint extends DefaultEndpoint {
private String destinationUri;
private String mep;
- private String operation;
+ private QName operation;
private JbiProducer producer;
@@ -56,20 +57,20 @@
parseUri(uri);
}
- public synchronized Producer<Exchange> createProducer() throws Exception {
+ public synchronized Producer createProducer() throws Exception {
if (producer == null) {
producer = new JbiProducer(this);
}
return producer;
}
- protected class JbiProducer extends DefaultProducer<Exchange> implements AsyncProcessor {
+ protected class JbiProducer extends DefaultProducer {
private final Log log = LogFactory.getLog(JbiProducer.class);
private CamelConsumerEndpoint consumer;
- public JbiProducer(Endpoint<Exchange> exchangeEndpoint) {
+ public JbiProducer(Endpoint exchangeEndpoint) {
super(exchangeEndpoint);
}
@@ -94,10 +95,6 @@
public void process(Exchange exchange) throws Exception {
consumer.process(exchange);
}
-
- public boolean process(Exchange exchange, AsyncCallback asyncCallback) {
- return consumer.process(exchange, asyncCallback);
- }
/*
* Access the underlying JBI Consumer endpoint
@@ -107,6 +104,7 @@
}
}
+ @SuppressWarnings("unchecked")
private void parseUri(String uri) {
destinationUri = uri;
try {
@@ -117,7 +115,10 @@
if (mep != null && !mep.startsWith("http://www.w3.org/ns/wsdl/")) {
mep = "http://www.w3.org/ns/wsdl/" + mep;
}
- operation = (String) params.get("operation");
+ String oper = (String) params.get("operation");
+ if (StringUtils.hasLength(oper)) {
+ operation = QName.valueOf(oper);
+ }
this.destinationUri = destinationUri.substring(0, idx);
}
} catch (URISyntaxException e) {
@@ -129,8 +130,8 @@
mep = str;
}
- public void setOperation(String str) {
- operation = str;
+ public void setOperation(QName operation) {
+ this.operation = operation;
}
public void setDestionationUri(String str) {
@@ -141,7 +142,7 @@
return mep;
}
- public String getOperation() {
+ public QName getOperation() {
return operation;
}
@@ -149,9 +150,9 @@
return destinationUri;
}
- public Consumer<Exchange> createConsumer(final Processor processor) throws Exception {
- return new DefaultConsumer<Exchange>(this, processor) {
- CamelProviderEndpoint jbiEndpoint;
+ public Consumer createConsumer(final Processor processor) throws Exception {
+ return new DefaultConsumer(this, processor) {
+ private CamelProviderEndpoint jbiEndpoint;
@Override
protected void doStart() throws Exception {
@@ -170,10 +171,6 @@
};
}
- public JbiBinding getBinding() {
- return jbiComponent.getBinding();
- }
-
public boolean isSingleton() {
return true;
}
Modified: servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java Mon Sep 7 14:30:27 2009
@@ -69,6 +69,7 @@
return new BaseServiceUnitManager(this, new Deployer[] {deployer});
}
+ @SuppressWarnings("unchecked")
public class OsgiCamelSpringDeployer extends CamelSpringDeployer {
public OsgiCamelSpringDeployer(OsgiCamelJbiComponent component) {
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/CamelConsumerEndpointTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/CamelConsumerEndpointTest.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/CamelConsumerEndpointTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/CamelConsumerEndpointTest.java Mon Sep 7 14:30:27 2009
@@ -29,6 +29,9 @@
public class CamelConsumerEndpointTest extends JbiTestSupport {
public void testInvalidMessageExchangeDoesNotThrowException() throws Exception {
+ // sending a message to start the producers and create the external endpoint
+ client.sendBody("direct:a", "<hello>world</hello>");
+
String endpointName =
jbiContainer.getRegistry().getExternalEndpointsForService(CamelConsumerEndpoint.SERVICE_NAME)[0].getEndpointName();
CamelConsumerEndpoint endpoint =
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiBindingTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiBindingTest.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiBindingTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiBindingTest.java Mon Sep 7 14:30:27 2009
@@ -37,6 +37,7 @@
import org.apache.camel.impl.DefaultMessage;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.tck.mock.MockExchangeFactory;
+import org.apache.servicemix.tck.mock.MockMessageExchange;
import org.apache.servicemix.tck.mock.MockNormalizedMessage;
public class JbiBindingTest extends TestCase {
@@ -68,8 +69,6 @@
me, exchange.getProperty(JbiBinding.MESSAGE_EXCHANGE));
assertEquals("JBI operation is available as a property",
OPERATION, exchange.getProperty(JbiBinding.OPERATION));
- assertEquals("JBI operation is available as a property (String value)",
- OPERATION.toString(), exchange.getProperty(JbiBinding.OPERATION_STRING));
assertEquals("Camel Exchange uses the same MEP",
ExchangePattern.InOnly, exchange.getPattern());
}
@@ -162,6 +161,21 @@
SUBJECT, to.getSecuritySubject());
}
+ public void testCopyFromCamelToJbiAddExchangeHeaders() throws Exception {
+ MessageExchange me = new MockMessageExchange();
+ me.setProperty(KEY, VALUE);
+
+ Exchange exchange = binding.createExchange(me);
+ exchange.setProperty(KEY, "another-value");
+ exchange.setProperty("another-key", "another-value");
+
+ binding.copyFromCamelToJbi(exchange, me);
+ assertEquals("Copy should not override existing MessageExchange properties",
+ VALUE, me.getProperty(KEY));
+ assertEquals("Copy should have added additional properties to the MessageExchange",
+ "another-value", me.getProperty("another-key"));
+ }
+
public void testIsSerializable() throws Exception {
assertTrue("A String is serializable", binding.isSerializable("test"));
assertFalse("JbiBinding is not serializable", binding.isSerializable(binding));
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiEndpointWithMepSpecifiedTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiEndpointWithMepSpecifiedTest.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiEndpointWithMepSpecifiedTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiEndpointWithMepSpecifiedTest.java Mon Sep 7 14:30:27 2009
@@ -23,7 +23,9 @@
import javax.jbi.messaging.MessagingException;
import javax.xml.namespace.QName;
+import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultExchange;
import org.apache.servicemix.jbi.container.ActivationSpec;
@@ -43,14 +45,11 @@
}
public void testCamelInOutSendJbiInOnly() throws Exception {
- client.send("direct:a", new DefaultExchange(camelContext) {
+ client.request("direct:a", new Processor() {
- @Override
- public ExchangePattern getPattern() {
- //let's explicitly send an in-out Exchange
- return ExchangePattern.InOut;
+ public void process(Exchange exchange) throws Exception {
+ // nothing to do here, we just want to send an empty exchange
}
-
});
assertEquals(1, component.getCount());
}
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyAsyncCamelTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyAsyncCamelTest.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyAsyncCamelTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyAsyncCamelTest.java Mon Sep 7 14:30:27 2009
@@ -67,10 +67,10 @@
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:dlc").maximumRedeliveries(0));
+ errorHandler(deadLetterChannel("mock:dlc").maximumRedeliveries(0).handled(false));
from("jbi:service:urn:test:in-only")
- .thread(1)
+ .threads(1)
.to("mock:done")
.to("jbi:service:urn:test:non-existent-service");
}
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyCamelErrorHandlingTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyCamelErrorHandlingTest.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyCamelErrorHandlingTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyCamelErrorHandlingTest.java Mon Sep 7 14:30:27 2009
@@ -173,7 +173,7 @@
public void configure() throws Exception {
onException(IllegalStateException.class).handled(false).to("jbi:service:urn:test:receiver-service");
onException(NullPointerException.class).handled(true).to("jbi:service:urn:test:receiver-service");
- errorHandler(deadLetterChannel("mock:errors").maximumRedeliveries(1).initialRedeliveryDelay(300));
+ errorHandler(deadLetterChannel("mock:errors").maximumRedeliveries(1).redeliverDelay(300).handled(false));
from("jbi:service:urn:test:no-handle-fault").to("jbi:service:urn:test:faulty-service");
from("jbi:service:urn:test:handle-fault").handleFault().to("jbi:service:urn:test:faulty-service");
from("jbi:service:urn:test:error-not-handled").to("jbi:service:urn:test:iae-error-service");
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyPropertiesPipelineTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyPropertiesPipelineTest.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyPropertiesPipelineTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyPropertiesPipelineTest.java Mon Sep 7 14:30:27 2009
@@ -56,9 +56,8 @@
assertEquals(ExchangeStatus.DONE, exchange.getStatus());
output.assertIsSatisfied();
- JbiExchange result = (JbiExchange) output.getExchanges().get(0);
- NormalizedMessage normalizedMessage = result.getInMessage();
+ NormalizedMessage normalizedMessage = JbiBinding.getMessageExchange(output.getExchanges().get(0)).getMessage("in");
assertNotNull(normalizedMessage.getProperty(HEADER_ORIGINAL));
assertNotNull(normalizedMessage.getProperty(HEADER_TRANSFORMER));
}
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyTest.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyTest.java Mon Sep 7 14:30:27 2009
@@ -110,7 +110,7 @@
@Override
public void configure() throws Exception {
// let's not retry things too often as this will only slow down the unit tests
- errorHandler(deadLetterChannel().maximumRedeliveries(0));
+ errorHandler(deadLetterChannel("mock:errors").maximumRedeliveries(0).handled(false));
from("jbi:service:urn:test:forward").to("jbi:service:urn:test:in-only?mep=in-only");
from("jbi:service:urn:test:in-only").convertBodyTo(String.class).to("mock:done");
@@ -121,7 +121,7 @@
});
from("jbi:service:urn:test:in-only-aggregator")
.to("log:info")
- .aggregator(header("key"))
+ .aggregate(header("key"))
.setHeader("aggregated").constant(true)
.to("log:info")
.to("mock:aggregated");
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyWithErrorHandledTrueSpringDSLTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyWithErrorHandledTrueSpringDSLTest.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyWithErrorHandledTrueSpringDSLTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyWithErrorHandledTrueSpringDSLTest.java Mon Sep 7 14:30:27 2009
@@ -27,6 +27,7 @@
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
+import org.apache.camel.Exchange;
import org.apache.camel.processor.DeadLetterChannel;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
@@ -56,9 +57,8 @@
receiver = new ReceiverComponent() {
public void onMessageExchange(MessageExchange exchange) throws MessagingException {
NormalizedMessage inMessage = getInMessage(exchange);
- Object value = inMessage.getProperty(DeadLetterChannel.CAUGHT_EXCEPTION_HEADER);
- Assert.notNull(value, DeadLetterChannel.CAUGHT_EXCEPTION_HEADER + " property not set");
try {
+ Assert.notNull(exchange.getProperty(Exchange.EXCEPTION_CAUGHT), Exchange.EXCEPTION_CAUGHT + " property not set");
MessageUtil.enableContentRereadability(inMessage);
String message = new SourceTransformer().contentToString(inMessage);
Assert.isTrue(message.contains(MESSAGE));
@@ -97,7 +97,7 @@
exchange = smxClient.receive();
assertEquals(ExchangeStatus.DONE, exchange.getStatus());
- assertNotNull(exchange.getMessage("in").getProperty(DeadLetterChannel.CAUGHT_EXCEPTION_HEADER));
+ assertNotNull(exchange.getProperty(Exchange.EXCEPTION_CAUGHT));
}
receiver.getMessageList().assertMessagesReceived(2);
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyWithFaultHandledTrueSpringDSLTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyWithFaultHandledTrueSpringDSLTest.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyWithFaultHandledTrueSpringDSLTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOnlyWithFaultHandledTrueSpringDSLTest.java Mon Sep 7 14:30:27 2009
@@ -30,6 +30,7 @@
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
+import org.apache.camel.Exchange;
import org.apache.camel.processor.DeadLetterChannel;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
@@ -59,9 +60,8 @@
receiver = new ReceiverComponent() {
public void onMessageExchange(MessageExchange exchange) throws MessagingException {
NormalizedMessage inMessage = getInMessage(exchange);
- Object value = inMessage.getProperty(DeadLetterChannel.CAUGHT_EXCEPTION_HEADER);
- Assert.notNull(value, DeadLetterChannel.CAUGHT_EXCEPTION_HEADER + " property not set");
try {
+ Assert.notNull(exchange.getProperty(Exchange.EXCEPTION_CAUGHT), Exchange.EXCEPTION_CAUGHT + " property not set");
MessageUtil.enableContentRereadability(inMessage);
String message = new SourceTransformer().contentToString(inMessage);
Assert.isTrue(message.contains(MESSAGE));
@@ -99,10 +99,10 @@
exchange = (InOnly)smxClient.receive();
assertEquals(ExchangeStatus.DONE, exchange.getStatus());
- assertNotNull(exchange.getMessage("in").getProperty(DeadLetterChannel.CAUGHT_EXCEPTION_HEADER));
+ assertNotNull(exchange.getProperty(Exchange.EXCEPTION_CAUGHT));
- receiver.getMessageList().assertMessagesReceived(1);
deadLetter.getMessageList().assertMessagesReceived(0);
+ receiver.getMessageList().assertMessagesReceived(1);
}
public void testRobustInOnlyWithFaultHandledByExceptionClause() throws Exception {
@@ -116,10 +116,10 @@
exchange = (RobustInOnly) smxClient.receive();
assertEquals(ExchangeStatus.DONE, exchange.getStatus());
- assertNotNull(exchange.getMessage("in").getProperty(DeadLetterChannel.CAUGHT_EXCEPTION_HEADER));
+ assertNotNull(exchange.getProperty(Exchange.EXCEPTION_CAUGHT));
- receiver.getMessageList().assertMessagesReceived(1);
deadLetter.getMessageList().assertMessagesReceived(0);
+ receiver.getMessageList().assertMessagesReceived(1);
}
@Override
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutCamelErrorHandlingTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutCamelErrorHandlingTest.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutCamelErrorHandlingTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutCamelErrorHandlingTest.java Mon Sep 7 14:30:27 2009
@@ -139,7 +139,7 @@
onException(IllegalStateException.class).handled(false).to("jbi:service:urn:test:receiver-service?mep=in-only");
onException(NullPointerException.class).handled(true).to("jbi:service:urn:test:receiver-service?mep=in-only");
onException(FaultException.class).handled(true).to("mock:faults-handled");
- errorHandler(deadLetterChannel("mock:errors").maximumRedeliveries(1).initialRedeliveryDelay(300));
+ errorHandler(deadLetterChannel("mock:errors").maximumRedeliveries(1).redeliverDelay(300).handled(false));
from("jbi:service:urn:test:no-handle-fault").to("jbi:service:urn:test:faulty-service");
from("jbi:service:urn:test:handle-fault").handleFault().to("jbi:service:urn:test:faulty-service");
from("jbi:service:urn:test:error-not-handled").to("jbi:service:urn:test:iae-error-service");
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutFromCamelRoute.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutFromCamelRoute.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutFromCamelRoute.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutFromCamelRoute.java Mon Sep 7 14:30:27 2009
@@ -48,6 +48,9 @@
inout.assertIsSatisfied();
done.assertIsSatisfied();
+
+ // let's wait a moment to make sure that the last DONE MessageExchange is handled
+ Thread.sleep(1000);
}
public void testInOutEchoesReplyAsync() throws Exception {
@@ -65,6 +68,9 @@
inout.assertIsSatisfied();
done.assertIsSatisfied();
+
+ // let's wait a moment to make sure that the last DONE MessageExchange is handled
+ Thread.sleep(1000);
}
@@ -93,7 +99,7 @@
.end().to("mock:done");
from("direct:async-in-out")
- .thread(1)
+ .threads(1)
.choice()
.when(header(REPLY_HEADER).isEqualTo(Boolean.TRUE)).to("jbi:service:urn:test:in-out-reply?mep=in-out")
.otherwise().to("jbi:service:urn:test:in-out-quiet?mep=in-out")
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutWithPojoTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutWithPojoTest.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutWithPojoTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutWithPojoTest.java Mon Sep 7 14:30:27 2009
@@ -62,7 +62,7 @@
@Override
public void configure() throws Exception {
// let's not retry things too often as this will only slow down the unit tests
- errorHandler(deadLetterChannel().maximumRedeliveries(0));
+ errorHandler(deadLetterChannel("mock:errors").maximumRedeliveries(0));
from("jbi:service:urn:test:pojo-payload")
.setBody().constant(new Object());
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiOperationCamelTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiOperationCamelTest.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiOperationCamelTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiOperationCamelTest.java Mon Sep 7 14:30:27 2009
@@ -32,7 +32,7 @@
*/
public class JbiOperationCamelTest extends JbiTestSupport {
- private static final String OPERATION = "doit";
+ private static final QName OPERATION = new QName("urn:test", "doit");
public void testInOnlySetOperationOnCamelEndpoint() throws Exception {
MockEndpoint inonly = getMockEndpoint("mock:in-only");
@@ -43,7 +43,7 @@
inonly.assertIsSatisfied();
Exchange exchange = inonly.getExchanges().get(0);
- assertEquals(OPERATION, exchange.getProperty("jbi.operation"));
+ assertEquals(OPERATION, JbiBinding.getOperation(exchange));
}
public void testInOnlySetOperationOnCamelExchange() throws Exception {
@@ -53,14 +53,14 @@
// this time, we set the target operation on the Camel Exchange
client.send("direct:in-only-noop", new Processor() {
public void process(Exchange exchange) throws Exception {
- exchange.setProperty("jbi.operation", OPERATION);
+ exchange.setProperty(JbiBinding.OPERATION, OPERATION);
exchange.getIn().setBody(new StringSource("<request>Sending you the operation, could you please perform it?</request>"));
}
});
inonly.assertIsSatisfied();
Exchange exchange = inonly.getExchanges().get(0);
- assertEquals(OPERATION, exchange.getProperty("jbi.operation"));
+ assertEquals(OPERATION, JbiBinding.getOperation(exchange));
}
@Override
@@ -78,8 +78,7 @@
from("jbi:service:urn:test:in-only").process(new Processor() {
public void process(Exchange exchange) throws Exception {
- JbiExchange jbi = (JbiExchange) exchange;
- assertEquals(new QName(OPERATION), jbi.getMessageExchange().getOperation());
+ assertEquals(OPERATION, JbiBinding.getOperation(exchange));
}
}).to("mock:in-only");
}
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiTestSupport.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiTestSupport.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiTestSupport.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiTestSupport.java Mon Sep 7 14:30:27 2009
@@ -32,10 +32,10 @@
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.TestSupport;
-import org.apache.camel.AsyncCallback;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.spi.Synchronization;
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.container.ActivationSpec;
@@ -60,11 +60,11 @@
protected CountDownLatch latch = new CountDownLatch(1);
- protected Endpoint<Exchange> endpoint;
+ protected Endpoint endpoint;
protected String startEndpointUri = "jbi:endpoint:serviceNamespace:serviceA:endpointA";
- protected ProducerTemplate<Exchange> client;
+ protected ProducerTemplate client;
protected ServiceMixClient servicemixClient;
@@ -86,14 +86,19 @@
*/
protected AtomicBoolean sendExchangeAsync(final Object expectedBody) {
final AtomicBoolean bool = new AtomicBoolean();
- client.send(endpoint, new Processor() {
+ client.asyncCallback(endpoint, new Processor() {
public void process(Exchange exchange) {
Message in = exchange.getIn();
in.setBody(expectedBody);
in.setHeader("cheese", 123);
}
- }, new AsyncCallback() {
- public void done(boolean b) {
+ }, new Synchronization() {
+
+ public void onFailure(Exchange exchange) {
+ // graciously do nothing here
+ }
+
+ public void onComplete(Exchange exchange) {
bool.set(true);
bool.notify();
}
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiToCamelCbrTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiToCamelCbrTest.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiToCamelCbrTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiToCamelCbrTest.java Mon Sep 7 14:30:27 2009
@@ -109,7 +109,7 @@
@Override
public void configure() throws Exception {
- streamCaching(); // remove streamCaching and the conversion to String once we use Camel 1.5
+ //streamCaching(); // remove streamCaching and the conversion to String once we use Camel 1.5
from("jbi:service:urn:test:polyglot").streamCaching().convertBodyTo(String.class)
.choice()
.when().xpath("/message/text() = 'bonjour'").to("mock:french")
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/NonJbiCamelEndpointsIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/NonJbiCamelEndpointsIntegrationTest.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/NonJbiCamelEndpointsIntegrationTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/NonJbiCamelEndpointsIntegrationTest.java Mon Sep 7 14:30:27 2009
@@ -76,7 +76,6 @@
client.sendSync(exchange);
checkResult(exchange);
//assertNotNull(exchange.getMessage("out").getContent());
- // TODO: check out the exchange
if (exchange.getStatus() == ExchangeStatus.ACTIVE) {
client.done(exchange);
}
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/TestCamelRouter.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/TestCamelRouter.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/TestCamelRouter.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/TestCamelRouter.java Mon Sep 7 14:30:27 2009
@@ -49,7 +49,8 @@
public void testWithFault() throws Exception {
a.whenExchangeReceived(1, new Processor() {
public void process(Exchange exchange) throws Exception {
- exchange.getFault().setBody("fault");
+ exchange.getOut().setBody("fault");
+ exchange.getOut().setFault(true);
}
});
a.expectedMessageCount(1);
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/su7/MyRouter.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/su7/MyRouter.java?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/su7/MyRouter.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/su7/MyRouter.java Mon Sep 7 14:30:27 2009
@@ -16,6 +16,8 @@
*/
package org.apache.servicemix.camel.su7;
+import javax.xml.namespace.QName;
+
import org.apache.camel.builder.RouteBuilder;
import org.apache.servicemix.camel.JbiEndpoint;
@@ -30,7 +32,7 @@
org.apache.camel.Endpoint endpoint = getContext().getEndpoint(toUri);
if (endpoint instanceof JbiEndpoint) {
JbiEndpoint jbiEndpoint = (JbiEndpoint) endpoint;
- jbiEndpoint.setOperation("{http://test}echo");
+ jbiEndpoint.setOperation(new QName("http://test", "echo"));
}
from("jbi:name:cheese").to(toUri);
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su1-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su1-src/camel-context.xml?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su1-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su1-src/camel-context.xml Mon Sep 7 14:30:27 2009
@@ -22,13 +22,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
+ <camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
- <from uri="seda:a"/>
- <to uri="seda:b"/>
+ <from uri="seda:a?waitForTaskToComplete=Never"/>
+ <to uri="log:b"/>
</route>
</camelContext>
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su10-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su10-src/camel-context.xml?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su10-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su10-src/camel-context.xml Mon Sep 7 14:30:27 2009
@@ -22,10 +22,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
+ <camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="mina:tcp://localhost:6200?textline=true"/>
<to uri="mock:result"/>
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su2-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su2-src/camel-context.xml?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su2-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su2-src/camel-context.xml Mon Sep 7 14:30:27 2009
@@ -22,13 +22,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
+ <camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="jbi:endpoint:http://foo.bar.org/myService/myEndpointName"/>
- <to uri="seda:b"/>
+ <to uri="log:b"/>
</route>
</camelContext>
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su3-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su3-src/camel-context.xml?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su3-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su3-src/camel-context.xml Mon Sep 7 14:30:27 2009
@@ -22,13 +22,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
+ <camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="jbi:service:http://foo.bar.org/myService"/>
- <to uri="seda:b"/>
+ <to uri="log:b"/>
</route>
</camelContext>
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su4-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su4-src/camel-context.xml?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su4-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su4-src/camel-context.xml Mon Sep 7 14:30:27 2009
@@ -22,13 +22,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
+ <camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="jbi:name:cheese"/>
- <to uri="seda:b"/>
+ <to uri="log:b"/>
</route>
</camelContext>
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su5-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su5-src/camel-context.xml?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su5-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su5-src/camel-context.xml Mon Sep 7 14:30:27 2009
@@ -22,10 +22,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
+ <camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="jbi:name:cheese"/>
<to uri="log:Su5Log" />
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su6-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su6-src/camel-context.xml?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su6-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su6-src/camel-context.xml Mon Sep 7 14:30:27 2009
@@ -22,10 +22,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
+ <camelContext xmlns="http://camel.apache.org/schema/spring">
<package>org.apache.servicemix.camel.su6</package>
</camelContext>
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su7-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su7-src/camel-context.xml?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su7-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su7-src/camel-context.xml Mon Sep 7 14:30:27 2009
@@ -22,10 +22,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
+ <camelContext xmlns="http://camel.apache.org/schema/spring">
<package>org.apache.servicemix.camel.su7</package>
</camelContext>
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su8-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su8-src/camel-context.xml?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su8-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su8-src/camel-context.xml Mon Sep 7 14:30:27 2009
@@ -22,11 +22,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
- <route errorHandlerRef="deadLetterErrorHandler">
+ <camelContext xmlns="http://camel.apache.org/schema/spring">
+ <route streamCache="true" handleFault="true" errorHandlerRef="deadLetterErrorHandler">
<from uri="jbi:service:urn:test:error-handled-true"/>
<onException>
<exception>java.lang.NullPointerException</exception>
@@ -36,24 +36,20 @@
</handled>
<to uri="jbi:service:urn:test:receiver-service"/>
</onException>
- <interceptor ref="handleFaultProcessor">
- <to uri="jbi:service:urn:test:npe-error-service"/>
- </interceptor>
+ <to uri="jbi:service:urn:test:npe-error-service"/>
</route>
</camelContext>
<bean id="deadLetterErrorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
- <property name="defaultDeadLetterEndpointUri" value="jbi:service:urn:test:deadLetter-service?mep=in-only"/>
+ <property name="deadLetterUri" value="jbi:service:urn:test:deadLetter-service?mep=in-only"/>
<property name="redeliveryPolicy" ref="redeliveryPolicyConfig" />
</bean>
<bean id="redeliveryPolicyConfig" class="org.apache.camel.processor.RedeliveryPolicy">
<property name="maximumRedeliveries" value="3" />
- <property name="initialRedeliveryDelay" value="2000" />
+ <property name="redeliverDelay" value="2000" />
<property name="useExponentialBackOff" value="true" />
<property name="backOffMultiplier" value="2" />
</bean>
- <bean id="handleFaultProcessor" class="org.apache.camel.processor.HandleFaultProcessor" />
-
</beans>
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su9-src/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su9-src/camel-context.xml?rev=812152&r1=812151&r2=812152&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su9-src/camel-context.xml (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/resources/org/apache/servicemix/camel/su9-src/camel-context.xml Mon Sep 7 14:30:27 2009
@@ -22,25 +22,20 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
- <route errorHandlerRef="deadLetterErrorHandler">
+ <camelContext xmlns="http://camel.apache.org/schema/spring">
+ <route streamCache="true" handleFault="true" errorHandlerRef="deadLetterErrorHandler">
<from uri="jbi:service:urn:test:fault-handled-true"/>
- <interceptor ref="handleFaultProcessor">
- <to uri="jbi:service:urn:test:faulty-service"/>
- </interceptor>
<onException>
<!-- Catch exception from in-only/robust-in-only message exchange. -->
<exception>org.apache.servicemix.jbi.exception.FaultException</exception>
- <interceptor ref="handleFaultProcessor2">
- <to uri="jbi:service:urn:test:receiver-service"/>
- </interceptor>
+ <redeliveryPolicy maximumRedeliveries="0"/>
<handled>
<constant>true</constant>
</handled>
- <redeliveryPolicy maximumRedeliveries="0"/>
+ <to uri="jbi:service:urn:test:receiver-service"/>
</onException>
<onException>
<!-- This clause is needed for testing since the test client still
@@ -51,36 +46,29 @@
TODO remove this when ServiceMix 3.3.1 is released.
-->
<exception>org.apache.servicemix.jbi.FaultException</exception>
- <interceptor ref="handleFaultProcessor3">
- <to uri="jbi:service:urn:test:receiver-service"/>
- </interceptor>
+ <redeliveryPolicy maximumRedeliveries="0"/>
<handled>
<constant>true</constant>
</handled>
- <redeliveryPolicy maximumRedeliveries="0"/>
+ <to uri="jbi:service:urn:test:receiver-service"/>
</onException>
+ <to uri="jbi:service:urn:test:faulty-service"/>
</route>
</camelContext>
<bean id="deadLetterErrorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
<property name="logger" ref="logger" />
- <property name="defaultDeadLetterEndpointUri" value="log:dlc?showBody=false,log:dlc"/>
+ <property name="deadLetterUri" value="log:dlc?showBody=false,log:dlc"/>
<property name="redeliveryPolicy" ref="redeliveryPolicyConfig" />
</bean>
<bean id="redeliveryPolicyConfig" class="org.apache.camel.processor.RedeliveryPolicy">
<property name="maximumRedeliveries" value="0" />
- <property name="initialRedeliveryDelay" value="2000" />
+ <property name="redeliverDelay" value="2000" />
<property name="useExponentialBackOff" value="true" />
<property name="backOffMultiplier" value="2" />
</bean>
<bean id="logger" class="org.apache.camel.processor.Logger" />
- <bean id="handleFaultProcessor" class="org.apache.camel.processor.HandleFaultProcessor" />
-
- <bean id="handleFaultProcessor2" class="org.apache.camel.processor.HandleFaultProcessor" />
-
- <bean id="handleFaultProcessor3" class="org.apache.camel.processor.HandleFaultProcessor" />
-
</beans>