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 2008/06/13 08:12:04 UTC
svn commit: r667370 - in /servicemix/smx3/trunk: ./
deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/
deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/
Author: gertv
Date: Thu Jun 12 23:12:04 2008
New Revision: 667370
URL: http://svn.apache.org/viewvc?rev=667370&view=rev
Log:
SM-1382 & SM-1397: Fixes for handling different MEPs with Camel
Added:
servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiEndpointWithMepSpecifiedTest.java
servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyTest.java
Modified:
servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelJbiEndpoint.java
servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java
servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java
servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiExchange.java
servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiTestSupport.java
servicemix/smx3/trunk/pom.xml
Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelJbiEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelJbiEndpoint.java?rev=667370&r1=667369&r2=667370&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelJbiEndpoint.java (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelJbiEndpoint.java Thu Jun 12 23:12:04 2008
@@ -90,14 +90,14 @@
if (LOG.isDebugEnabled()) {
LOG.debug("Received exchange: " + exchange);
}
- JbiExchange camelExchange = new JbiExchange(camelEndpoint.getContext(), binding, exchange);
+ JbiExchange camelExchange = new JbiExchange(camelEndpoint.getCamelContext(), binding, exchange);
camelProcessor.process(camelExchange);
done(exchange);
} else {
if (LOG.isDebugEnabled()) {
LOG.debug("Received exchange: " + exchange);
}
- JbiExchange camelExchange = new JbiExchange(camelEndpoint.getContext(), binding, exchange);
+ JbiExchange camelExchange = new JbiExchange(camelEndpoint.getCamelContext(), binding, exchange);
camelProcessor.process(camelExchange);
boolean txSync = exchange.isTransacted() && Boolean.TRUE.equals(exchange.getProperty(JbiConstants.SEND_SYNC));
if (txSync) {
Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java?rev=667370&r1=667369&r2=667370&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java Thu Jun 12 23:12:04 2008
@@ -93,12 +93,15 @@
MessageExchangeFactory exchangeFactory, String defaultMep)
throws MessagingException, URISyntaxException {
- ExchangePattern mep = camelExchange.getPattern();
+ // option 1 -- use the MEP that was configured on the endpoint URI
+ ExchangePattern mep = ExchangePattern.fromWsdlUri(defaultMep);
if (mep == null) {
- mep = ExchangePattern.fromWsdlUri(defaultMep);
+ // option 2 -- use the MEP configured on the ToJbiProcessor
+ mep = ExchangePattern.fromWsdlUri(getMessageExchangePattern());
}
if (mep == null) {
- mep = ExchangePattern.fromWsdlUri(getMessageExchangePattern());
+ // option 3 -- use the MEP from the Camel Exchange
+ mep = camelExchange.getPattern();
}
MessageExchange answer = null;
if (mep != null) {
Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java?rev=667370&r1=667369&r2=667370&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiEndpoint.java Thu Jun 12 23:12:04 2008
@@ -122,7 +122,7 @@
}
public JbiExchange createExchange() {
- return new JbiExchange(getContext(), getBinding());
+ return new JbiExchange(getCamelContext(), getBinding());
}
public JbiBinding getBinding() {
Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiExchange.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiExchange.java?rev=667370&r1=667369&r2=667370&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiExchange.java (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiExchange.java Thu Jun 12 23:12:04 2008
@@ -17,6 +17,7 @@
package org.apache.servicemix.camel;
import javax.jbi.JBIException;
+import javax.jbi.messaging.InOnly;
import javax.jbi.messaging.MessageExchange;
import javax.jbi.messaging.NormalizedMessage;
@@ -140,7 +141,12 @@
@Override
protected JbiMessage createOutMessage() {
- return createMessage("out");
+ if (messageExchange instanceof InOnly) {
+ //just create an Camel Message without trying to create a matching JBI 'out' NormalizedMessage
+ return new JbiMessage();
+ } else {
+ return createMessage("out");
+ }
}
@Override
Added: servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiEndpointWithMepSpecifiedTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiEndpointWithMepSpecifiedTest.java?rev=667370&view=auto
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiEndpointWithMepSpecifiedTest.java (added)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiEndpointWithMepSpecifiedTest.java Thu Jun 12 23:12:04 2008
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.servicemix.camel;
+
+import java.util.List;
+
+import javax.jbi.messaging.InOnly;
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.messaging.MessagingException;
+import javax.xml.namespace.QName;
+
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.impl.DefaultExchange;
+import org.apache.servicemix.jbi.container.ActivationSpec;
+import org.apache.servicemix.tck.ReceiverComponent;
+
+/**
+ * Tests to check correct handling of the ?mep=xxx setting on a Camel JBI endpoint
+ */
+public class JbiEndpointWithMepSpecifiedTest extends JbiTestSupport {
+
+ private MyReceiverComponent component;
+
+ @Override
+ protected void setUp() throws Exception {
+ component = new MyReceiverComponent();
+ super.setUp();
+ }
+
+ public void testCamelInOutSendJbiInOnly() throws Exception {
+ client.send("direct:a", new DefaultExchange(camelContext) {
+
+ @Override
+ public ExchangePattern getPattern() {
+ //let's explicitly send an in-out Exchange
+ return ExchangePattern.InOut;
+ }
+
+ });
+ assertEquals(1, component.count);
+ }
+
+ @Override
+ protected void appendJbiActivationSpecs(List<ActivationSpec> activationSpecList) {
+ ActivationSpec spec = new ActivationSpec();
+ spec.setComponent(component);
+ spec.setComponentName("receiver");
+ spec.setService(new QName("urn:test", "service"));
+ activationSpecList.add(spec);
+ }
+
+ @Override
+ protected RouteBuilder createRoutes() {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:a").to("jbi:service:urn:test:service?mep=in-only");
+ }
+ };
+ }
+
+ private class MyReceiverComponent extends ReceiverComponent {
+
+ private int count;
+
+ @Override
+ public void onMessageExchange(MessageExchange exchange) throws MessagingException {
+ if (exchange instanceof InOnly) {
+ count++;
+ done(exchange);
+ } else {
+ fail(exchange, new Exception("Unexpected MEP: " + exchange.getPattern()));
+ }
+ }
+ }
+}
Added: servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyTest.java?rev=667370&view=auto
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyTest.java (added)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyTest.java Thu Jun 12 23:12:04 2008
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.servicemix.camel;
+
+import java.util.List;
+
+import javax.jbi.messaging.InOnly;
+import javax.xml.namespace.QName;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.converter.jaxp.StringSource;
+import org.apache.servicemix.client.DefaultServiceMixClient;
+import org.apache.servicemix.client.ServiceMixClient;
+import org.apache.servicemix.jbi.container.ActivationSpec;
+
+/**
+ * Tests on handling JBI InOnly exchanges by Camel
+ */
+public class JbiInOnlyTest extends JbiTestSupport {
+
+ private static final String MESSAGE = "<just><a>test</a></just>";
+
+ public void testInOnlyExchangeConvertBody() throws Exception {
+ MockEndpoint done = getMockEndpoint("mock:done");
+ done.expectedBodiesReceived(MESSAGE);
+
+ ServiceMixClient client = new DefaultServiceMixClient(jbiContainer);
+ InOnly exchange = client.createInOnlyExchange();
+ exchange.setService(new QName("urn:test", "in-only"));
+ exchange.getInMessage().setContent(new StringSource(MESSAGE));
+ client.send(exchange);
+
+ done.assertIsSatisfied();
+ }
+
+ private MockEndpoint getMockEndpoint(String uri) {
+ return (MockEndpoint)camelContext.getEndpoint(uri);
+ }
+
+ @Override
+ protected void appendJbiActivationSpecs(List<ActivationSpec> activationSpecList) {
+ // no additional activation specs required
+ }
+
+ @Override
+ protected RouteBuilder createRoutes() {
+ return new RouteBuilder() {
+
+ @Override
+ public void configure() throws Exception {
+ from("jbi:service:urn:test:in-only").convertBodyTo(String.class).to("mock:done");
+ }
+
+ };
+ }
+
+
+}
Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiTestSupport.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiTestSupport.java?rev=667370&r1=667369&r2=667370&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiTestSupport.java (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiTestSupport.java Thu Jun 12 23:12:04 2008
@@ -28,10 +28,10 @@
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.TestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.util.ProducerCache;
import org.apache.servicemix.jbi.container.ActivationSpec;
import org.apache.servicemix.jbi.container.SpringJBIContainer;
@@ -51,7 +51,7 @@
protected String startEndpointUri = "jbi:endpoint:serviceNamespace:serviceA:endpointA";
- protected ProducerCache<Exchange> client = new ProducerCache<Exchange>();
+ protected ProducerTemplate<Exchange> client = camelContext.createProducerTemplate();
/**
* Sends an exchange to the endpoint
Modified: servicemix/smx3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=667370&r1=667369&r2=667370&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Thu Jun 12 23:12:04 2008
@@ -213,7 +213,7 @@
<spring-version>2.0.6</spring-version>
<activemq-version>5.1.0</activemq-version>
<activeio-version>3.1.0</activeio-version>
- <camel-version>1.3.0</camel-version>
+ <camel-version>1.4-SNAPSHOT</camel-version>
<jencks-version>2.1</jencks-version>
<jetty-version>6.1.6</jetty-version>
<geronimo-version>2.0.1</geronimo-version>