Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0762DE510 for ; Thu, 21 Feb 2013 04:29:49 +0000 (UTC) Received: (qmail 78482 invoked by uid 500); 21 Feb 2013 04:29:48 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 78376 invoked by uid 500); 21 Feb 2013 04:29:47 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 78340 invoked by uid 99); 21 Feb 2013 04:29:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Feb 2013 04:29:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Feb 2013 04:29:43 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 28B2B23889CB; Thu, 21 Feb 2013 04:29:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1448509 - in /camel/trunk/components/camel-cxf/src: main/java/org/apache/camel/component/cxf/CxfConsumer.java test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java Date: Thu, 21 Feb 2013 04:29:23 -0000 To: commits@camel.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130221042923.28B2B23889CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Thu Feb 21 04:29:22 2013 New Revision: 1448509 URL: http://svn.apache.org/r1448509 Log: CAMEL-6092 set the MEP according to the BindingOperationInfo in CxfConsumer Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java?rev=1448509&r1=1448508&r2=1448509&view=diff ============================================================================== --- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java (original) +++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java Thu Feb 21 04:29:22 2013 @@ -23,6 +23,7 @@ import java.util.Map; import javax.xml.ws.WebFault; import org.w3c.dom.Element; import org.apache.camel.AsyncCallback; +import org.apache.camel.ExchangePattern; import org.apache.camel.Processor; import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.impl.DefaultConsumer; @@ -145,7 +146,7 @@ public class CxfConsumer extends Default CxfEndpoint endpoint = (CxfEndpoint)getEndpoint(); CxfBinding binding = endpoint.getCxfBinding(); - // create a Camel exchange + // create a Camel exchange, the default MEP is InOut org.apache.camel.Exchange camelExchange = endpoint.createExchange(); DataFormat dataFormat = endpoint.getDataFormat(); @@ -159,6 +160,10 @@ public class CxfConsumer extends Default if (boi != null) { camelExchange.setProperty(BindingOperationInfo.class.getName(), boi); LOG.trace("Set exchange property: BindingOperationInfo: {}", boi); + // set the message exchange patter with the boi + if (boi.getOperationInfo().isOneWay()) { + camelExchange.setPattern(ExchangePattern.InOnly); + } } // set data format mode in Camel exchange Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java?rev=1448509&r1=1448508&r2=1448509&view=diff ============================================================================== --- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java (original) +++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java Thu Feb 21 04:29:22 2013 @@ -23,6 +23,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; import org.apache.camel.Exchange; +import org.apache.camel.ExchangePattern; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.spring.CamelSpringTestSupport; @@ -88,6 +89,8 @@ public class CxfOneWayRouteTest extends static final byte[] MAGIC = {(byte)0xca, 0x3e, 0x1e}; public void process(Exchange exchange) throws Exception { + // just check the MEP here + assertEquals("Don't get the right MEP", ExchangePattern.InOnly, exchange.getPattern()); // adding some binary segment String msg = exchange.getIn().getBody(String.class); ByteArrayOutputStream bos = new ByteArrayOutputStream();