Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 97520 invoked from network); 22 Mar 2009 17:43:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 Mar 2009 17:43:39 -0000 Received: (qmail 86285 invoked by uid 500); 22 Mar 2009 17:43:39 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 86242 invoked by uid 500); 22 Mar 2009 17:43:39 -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 86233 invoked by uid 99); 22 Mar 2009 17:43:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Mar 2009 17:43:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sun, 22 Mar 2009 17:43:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D937523888A0; Sun, 22 Mar 2009 17:43:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r757221 - in /camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf: CxfConstants.java CxfConsumer.java CxfProducer.java DefaultCxfBinding.java Date: Sun, 22 Mar 2009 17:43:15 -0000 To: commits@camel.apache.org From: wtam@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090322174315.D937523888A0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wtam Date: Sun Mar 22 17:43:14 2009 New Revision: 757221 URL: http://svn.apache.org/viewvc?rev=757221&view=rev Log: [CAMEL-1476] Set property in the exchange to identify CXF component DataFormat mode (payload, message, or pojo) Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java?rev=757221&r1=757220&r2=757221&view=diff ============================================================================== --- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java (original) +++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java Sun Mar 22 17:43:14 2009 @@ -24,7 +24,8 @@ public interface CxfConstants { String METHOD = "method"; String SERVICE_CLASS = "serviceClass"; - String DATA_FORMAT = "dataFormat"; + // org.apache.camel.cxf.dataFormat is used as exchange property key + String DATA_FORMAT_PROPERTY = "org.apache.camel.cxf.dataFormat"; String SET_DEFAULT_BUS = "setDefaultBus"; String WSDL_URL = "wsdlURL"; String ADDRESS = "address"; 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=757221&r1=757220&r2=757221&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 Sun Mar 22 17:43:14 2009 @@ -62,7 +62,7 @@ // set data format mode in Camel exchange DataFormat dataFormat = endpoint.getDataFormat(); - camelExchange.setProperty(DataFormat.class.getName(), dataFormat); + camelExchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, dataFormat); if (LOG.isTraceEnabled()) { LOG.trace("Set Exchange property: " + DataFormat.class.getName() + "=" + dataFormat); Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?rev=757221&r1=757220&r2=757221&view=diff ============================================================================== --- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java (original) +++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java Sun Mar 22 17:43:14 2009 @@ -86,7 +86,7 @@ // set data format mode in exchange DataFormat dataFormat = endpoint.getDataFormat(); - camelExchange.setProperty(DataFormat.class.getName(), dataFormat); + camelExchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, dataFormat); if (LOG.isTraceEnabled()) { LOG.trace("Set Camel Exchange property: " + DataFormat.class.getName() + "=" + dataFormat); Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java?rev=757221&r1=757220&r2=757221&view=diff ============================================================================== --- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java (original) +++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java Sun Mar 22 17:43:14 2009 @@ -101,7 +101,7 @@ // propagate body camelExchange.getOut().setBody(DefaultCxfBinding.getContentFromCxf(cxfMessage, - camelExchange.getProperty(DataFormat.class.getName(), DataFormat.class))); + camelExchange.getProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.class))); // propagate response context if (responseContext != null && responseContext.size() > 0) { @@ -198,7 +198,7 @@ // set body Object body = DefaultCxfBinding.getContentFromCxf(cxfMessage, - camelExchange.getProperty(DataFormat.class.getName(), DataFormat.class)); + camelExchange.getProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.class)); if (body != null) { camelExchange.getIn().setBody(body); } @@ -226,7 +226,7 @@ Message outMessage = ep.getBinding().createMessage(); cxfExchange.setOutMessage(outMessage); - DataFormat dataFormat = camelExchange.getProperty(DataFormat.class.getName(), + DataFormat dataFormat = camelExchange.getProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.class); // propagate contexts