Return-Path: Delivered-To: apmail-camel-dev-archive@www.apache.org Received: (qmail 87493 invoked from network); 11 Mar 2010 18:59:12 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 11 Mar 2010 18:59:12 -0000 Received: (qmail 71442 invoked by uid 500); 11 Mar 2010 18:58:38 -0000 Delivered-To: apmail-camel-dev-archive@camel.apache.org Received: (qmail 71398 invoked by uid 500); 11 Mar 2010 18:58:38 -0000 Mailing-List: contact dev-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 dev@camel.apache.org Received: (qmail 71390 invoked by uid 99); 11 Mar 2010 18:58:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Mar 2010 18:58:38 +0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests=FREEMAIL_FROM,MIME_QP_LONG_LINE,SPF_PASS,T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of hzbarcea@gmail.com designates 74.125.83.45 as permitted sender) Received: from [74.125.83.45] (HELO mail-gw0-f45.google.com) (74.125.83.45) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Mar 2010 18:58:28 +0000 Received: by gwaa18 with SMTP id a18so174934gwa.32 for ; Thu, 11 Mar 2010 10:58:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:content-type:mime-version :subject:from:in-reply-to:date:content-transfer-encoding:message-id :references:to:x-mailer; bh=bshcEOdOyQe0C5C5jH+3bzSxsJ/AYOc61Pyx0sFvA/E=; b=MsOBJ6jgPiaic5eeKo7tDOuWacmlag9CrSfALcpAqfYsmFXPR1ZImnVK1H0lVfjjuZ /GkTIJAHHRq216ggUO+fqI9nyK7JpgzMgiT7lWxRQCbVqA0DslhgJXDbPFN8v/wtMmvt rJBhIckLrhfcrZODarjgNS2GpFYHByXmBUyAM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=content-type:mime-version:subject:from:in-reply-to:date :content-transfer-encoding:message-id:references:to:x-mailer; b=CO2Dm8FW/ZlRUOD0tV62K1Lo8QsBBCBeYBSM/0yj/rrPrLRE5Z4uFxJ7Iu7SdFGDcJ 1KYeyrMan6I3dKrKk5Y3XXtzDSJScR6AuLA8omTXKoQkz4JWHSQmX8cTuZ0DVbzLBYsM M54rwNRbZ95l+cwQ73pjtAvjZ/o064cniZvZI= Received: by 10.150.244.15 with SMTP id r15mr4627094ybh.93.1268333887053; Thu, 11 Mar 2010 10:58:07 -0800 (PST) Received: from [10.40.58.200] (cpe-075-182-108-220.nc.res.rr.com [75.182.108.220]) by mx.google.com with ESMTPS id 7sm90457yxg.50.2010.03.11.10.58.04 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 11 Mar 2010 10:58:05 -0800 (PST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Apple Message framework v1077) Subject: Re: svn commit: r921743 - in /camel/trunk/components/camel-cxf/src: main/java/org/apache/camel/component/cxf/ main/java/org/apache/camel/component/cxf/cxfbean/ main/java/org/apache/camel/component/cxf/transport/ main/java/org/apache/camel/component/cxf/uti... From: Hadrian Zbarcea In-Reply-To: <20100311090813.498E82388900@eris.apache.org> Date: Thu, 11 Mar 2010 13:58:03 -0500 Content-Transfer-Encoding: quoted-printable Message-Id: References: <20100311090813.498E82388900@eris.apache.org> To: dev@camel.apache.org X-Mailer: Apple Mail (2.1077) X-Virus-Checked: Checked by ClamAV on apache.org Willem,=20 Did you forget to add CxfMessageHelper? Hadrian On Mar 11, 2010, at 4:08 AM, ningjiang@apache.org wrote: > Author: ningjiang > Date: Thu Mar 11 09:08:12 2010 > New Revision: 921743 >=20 > URL: http://svn.apache.org/viewvc?rev=3D921743&view=3Drev > Log: > CAMEL-2535 Get ride of the cxfsoap component >=20 > Added: > = camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/= cxf/util/CxfMessageHelperTest.java (contents, props changed) > - copied, changed from r921272, = camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/= cxf/CxfSoapBindingTest.java > = camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/compo= nent/cxf/util/RequestBody.xml (props changed) > - copied unchanged from r921272, = camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/compo= nent/cxf/RequestBody.xml > Removed: > = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/CxfAroundProcessor.java > = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/CxfSoapBinding.java > = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/CxfSoapComponent.java > = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/CxfSoapConsumer.java > = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/CxfSoapEndpoint.java > = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/CxfSoapProducer.java > = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/util/Dummy.java > = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/util/NullConduit.java > = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/util/NullConduitSelector.java > = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/util/NullDestination.java > = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/util/NullDestinationFactory.java > = camel/trunk/components/camel-cxf/src/main/resources/META-INF/services/org/= apache/camel/component/soap > = camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/= cxf/CxfSoapBindingTest.java > = camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/= cxf/CxfSoapTest.java > = camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/compo= nent/cxf/RequestBody.xml > Modified: > = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/CxfPayload.java > = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/cxfbean/DefaultCxfBeanBinding.java > = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/transport/CamelConduit.java > = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/transport/CamelDestination.java > = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/util/WSDLSoapServiceFactoryBean.java >=20 > Modified: = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/CxfPayload.java > URL: = http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/jav= a/org/apache/camel/component/cxf/CxfPayload.java?rev=3D921743&r1=3D921742&= r2=3D921743&view=3Ddiff > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/CxfPayload.java (original) > +++ = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/CxfPayload.java Thu Mar 11 09:08:12 2010 > @@ -17,7 +17,9 @@ > package org.apache.camel.component.cxf; >=20 > import java.util.List; > + > import javax.xml.transform.TransformerException; > + > import org.w3c.dom.Element; >=20 > import org.apache.camel.converter.jaxp.XmlConverter; >=20 > Modified: = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/cxfbean/DefaultCxfBeanBinding.java > URL: = http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/jav= a/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java?rev=3D= 921743&r1=3D921742&r2=3D921743&view=3Ddiff > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/cxfbean/DefaultCxfBeanBinding.java (original) > +++ = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/cxfbean/DefaultCxfBeanBinding.java Thu Mar 11 09:08:12 2010 > @@ -20,7 +20,7 @@ import java.util.List; > import java.util.Map; >=20 > import org.apache.camel.Exchange; > -import org.apache.camel.component.cxf.CxfSoapBinding; > +import org.apache.camel.component.cxf.util.CxfMessageHelper; > import org.apache.camel.spi.HeaderFilterStrategy; > import org.apache.commons.logging.Log; > import org.apache.commons.logging.LogFactory; > @@ -67,7 +67,7 @@ public class DefaultCxfBeanBinding imple >=20 >=20 > org.apache.cxf.message.Message answer =3D=20 > - CxfSoapBinding.getCxfInMessage(headerFilterStrategy, = camelExchange, false); > + CxfMessageHelper.getCxfInMessage(headerFilterStrategy, = camelExchange, false); >=20 > answer.put(org.apache.cxf.message.Message.REQUEST_URI, path); > answer.put(org.apache.cxf.message.Message.BASE_PATH, = basePath); >=20 > Modified: = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/transport/CamelConduit.java > URL: = http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/jav= a/org/apache/camel/component/cxf/transport/CamelConduit.java?rev=3D921743&= r1=3D921742&r2=3D921743&view=3Ddiff > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/transport/CamelConduit.java (original) > +++ = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/transport/CamelConduit.java Thu Mar 11 09:08:12 2010 > @@ -26,8 +26,8 @@ import org.apache.camel.ExchangePattern; > import org.apache.camel.Processor; > import org.apache.camel.ProducerTemplate; > import org.apache.camel.component.cxf.CxfConstants; > -import org.apache.camel.component.cxf.CxfSoapBinding; > import org.apache.camel.component.cxf.util.CxfHeaderHelper; > +import org.apache.camel.component.cxf.util.CxfMessageHelper; > import org.apache.camel.impl.DefaultCamelContext; > import org.apache.camel.spi.HeaderFilterStrategy; > import org.apache.camel.util.IOHelper; > @@ -193,7 +193,7 @@ public class CamelConduit extends Abstra > private void handleResponse(org.apache.camel.Exchange = exchange) throws IOException { > org.apache.cxf.message.Message inMessage =3D null; > try { > - inMessage =3D = CxfSoapBinding.getCxfInMessage(headerFilterStrategy, > + inMessage =3D = CxfMessageHelper.getCxfInMessage(headerFilterStrategy, > exchange, true); > } catch (Exception ex) { > // Throw IOException here >=20 > Modified: = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/transport/CamelDestination.java > URL: = http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/jav= a/org/apache/camel/component/cxf/transport/CamelDestination.java?rev=3D921= 743&r1=3D921742&r2=3D921743&view=3Ddiff > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/transport/CamelDestination.java (original) > +++ = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/transport/CamelDestination.java Thu Mar 11 09:08:12 2010 > @@ -28,8 +28,8 @@ import org.apache.camel.Exchange; > import org.apache.camel.Processor; > import org.apache.camel.ProducerTemplate; > import org.apache.camel.component.cxf.CxfConstants; > -import org.apache.camel.component.cxf.CxfSoapBinding; > import org.apache.camel.component.cxf.util.CxfHeaderHelper; > +import org.apache.camel.component.cxf.util.CxfMessageHelper; > import org.apache.camel.impl.DefaultCamelContext; > import org.apache.camel.spi.HeaderFilterStrategy; > import org.apache.cxf.Bus; > @@ -157,7 +157,7 @@ public class CamelDestination extends Ab > protected void incoming(org.apache.camel.Exchange camelExchange) { > getLogger().log(Level.FINE, "server received request: ", = camelExchange); > org.apache.cxf.message.Message inMessage =3D > - CxfSoapBinding.getCxfInMessage(headerFilterStrategy, = camelExchange, false); > + CxfMessageHelper.getCxfInMessage(headerFilterStrategy, = camelExchange, false); >=20 > inMessage.put(CxfConstants.CAMEL_EXCHANGE, camelExchange); > ((MessageImpl)inMessage).setDestination(this); >=20 > Modified: = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/util/WSDLSoapServiceFactoryBean.java > URL: = http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/jav= a/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java?rev=3D= 921743&r1=3D921742&r2=3D921743&view=3Ddiff > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/util/WSDLSoapServiceFactoryBean.java (original) > +++ = camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/= cxf/util/WSDLSoapServiceFactoryBean.java Thu Mar 11 09:08:12 2010 > @@ -37,7 +37,7 @@ import org.apache.cxf.service.model.Endp > import org.apache.cxf.service.model.ServiceInfo; > import org.apache.cxf.wsdl11.WSDLServiceFactory; >=20 > -//The service factorybean which just create the service for soap = component > +//The service factory bean which is used for the service without SEI > public class WSDLSoapServiceFactoryBean extends = ReflectionServiceFactoryBean { > private QName serviceName; > private QName endpointName; >=20 > Copied: = camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/= cxf/util/CxfMessageHelperTest.java (from r921272, = camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/= cxf/CxfSoapBindingTest.java) > URL: = http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/jav= a/org/apache/camel/component/cxf/util/CxfMessageHelperTest.java?p2=3Dcamel= /trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/u= til/CxfMessageHelperTest.java&p1=3Dcamel/trunk/components/camel-cxf/src/te= st/java/org/apache/camel/component/cxf/CxfSoapBindingTest.java&r1=3D921272= &r2=3D921743&rev=3D921743&view=3Ddiff > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- = camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/= cxf/CxfSoapBindingTest.java (original) > +++ = camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/= cxf/util/CxfMessageHelperTest.java Thu Mar 11 09:08:12 2010 > @@ -14,7 +14,7 @@ > * See the License for the specific language governing permissions and > * limitations under the License. > */ > -package org.apache.camel.component.cxf; > +package org.apache.camel.component.cxf.util; >=20 > import java.io.File; > import java.io.FileInputStream; > @@ -25,6 +25,7 @@ import java.net.URL; > import javax.xml.stream.XMLStreamReader; > import javax.xml.transform.dom.DOMSource; >=20 > +import org.apache.camel.component.cxf.CxfHeaderFilterStrategy; > import org.apache.camel.impl.DefaultCamelContext; > import org.apache.camel.impl.DefaultExchange; > import org.apache.camel.spi.HeaderFilterStrategy; > @@ -34,7 +35,7 @@ import org.apache.cxf.staxutils.StaxUtil > import org.junit.Assert; > import org.junit.Test; >=20 > -public class CxfSoapBindingTest extends Assert { > +public class CxfMessageHelperTest extends Assert { > private static final String REQUEST_STRING =3D > "";= > private DefaultCamelContext context =3D new DefaultCamelContext(); > @@ -47,7 +48,7 @@ public class CxfSoapBindingTest extends=20 > org.apache.camel.Exchange exchange =3D new = DefaultExchange(context); > // String > exchange.getIn().setBody("hello world"); > - org.apache.cxf.message.Message message =3D = CxfSoapBinding.getCxfInMessage( > + org.apache.cxf.message.Message message =3D = CxfMessageHelper.getCxfInMessage( > headerFilterStrategy, exchange, false); > // test message > InputStream is =3D message.getContent(InputStream.class); > @@ -61,14 +62,14 @@ public class CxfSoapBindingTest extends=20 > XMLStreamReader xmlReader =3D = StaxUtils.createXMLStreamReader(inputStream); > DOMSource source =3D new DOMSource(StaxUtils.read(xmlReader)); > exchange.getIn().setBody(source); > - message =3D = CxfSoapBinding.getCxfInMessage(headerFilterStrategy, exchange, false); > + message =3D = CxfMessageHelper.getCxfInMessage(headerFilterStrategy, exchange, false); > is =3D message.getContent(InputStream.class); > assertNotNull("The input stream should not be null", is); > assertEquals("Don't get the right message", toString(is), = REQUEST_STRING); >=20 > // File > exchange.getIn().setBody(requestFile); > - message =3D = CxfSoapBinding.getCxfInMessage(headerFilterStrategy, exchange, false); > + message =3D = CxfMessageHelper.getCxfInMessage(headerFilterStrategy, exchange, false); > is =3D message.getContent(InputStream.class); > assertNotNull("The input stream should not be null", is); > assertEquals("Don't get the right message", toString(is), = REQUEST_STRING); >=20 > Propchange: = camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/= cxf/util/CxfMessageHelperTest.java > = --------------------------------------------------------------------------= ---- > svn:eol-style =3D native >=20 > Propchange: = camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/= cxf/util/CxfMessageHelperTest.java > = --------------------------------------------------------------------------= ---- > svn:keywords =3D Rev Date >=20 > Propchange: = camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/= cxf/util/CxfMessageHelperTest.java > = --------------------------------------------------------------------------= ---- > svn:mergeinfo =3D=20 >=20 > Propchange: = camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/compo= nent/cxf/util/RequestBody.xml > = --------------------------------------------------------------------------= ---- > svn:eol-style =3D native >=20 > Propchange: = camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/compo= nent/cxf/util/RequestBody.xml > = --------------------------------------------------------------------------= ---- > svn:keywords =3D Rev Date >=20 > Propchange: = camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/compo= nent/cxf/util/RequestBody.xml > = --------------------------------------------------------------------------= ---- > svn:mergeinfo =3D=20 >=20 > Propchange: = camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/compo= nent/cxf/util/RequestBody.xml > = --------------------------------------------------------------------------= ---- > svn:mime-type =3D text/xml >=20 >=20