Willem, Did you forget to add CxfMessageHelper?
Hadrian On Mar 11, 2010, at 4:08 AM, [email protected] wrote: > Author: ningjiang > Date: Thu Mar 11 09:08:12 2010 > New Revision: 921743 > > URL: http://svn.apache.org/viewvc?rev=921743&view=rev > Log: > CAMEL-2535 Get ride of the cxfsoap component > > 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/component/cxf/util/RequestBody.xml > (props changed) > - copied unchanged from r921272, > camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/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/component/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 > > 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/java/org/apache/camel/component/cxf/CxfPayload.java?rev=921743&r1=921742&r2=921743&view=diff > ============================================================================== > --- > 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; > > import java.util.List; > + > import javax.xml.transform.TransformerException; > + > import org.w3c.dom.Element; > > import org.apache.camel.converter.jaxp.XmlConverter; > > 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/java/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java?rev=921743&r1=921742&r2=921743&view=diff > ============================================================================== > --- > 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; > > 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 > > > org.apache.cxf.message.Message answer = > - CxfSoapBinding.getCxfInMessage(headerFilterStrategy, > camelExchange, false); > + CxfMessageHelper.getCxfInMessage(headerFilterStrategy, > camelExchange, false); > > answer.put(org.apache.cxf.message.Message.REQUEST_URI, path); > answer.put(org.apache.cxf.message.Message.BASE_PATH, basePath); > > 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/java/org/apache/camel/component/cxf/transport/CamelConduit.java?rev=921743&r1=921742&r2=921743&view=diff > ============================================================================== > --- > 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 = null; > try { > - inMessage = > CxfSoapBinding.getCxfInMessage(headerFilterStrategy, > + inMessage = > CxfMessageHelper.getCxfInMessage(headerFilterStrategy, > exchange, true); > } catch (Exception ex) { > // Throw IOException here > > 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/java/org/apache/camel/component/cxf/transport/CamelDestination.java?rev=921743&r1=921742&r2=921743&view=diff > ============================================================================== > --- > 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 = > - CxfSoapBinding.getCxfInMessage(headerFilterStrategy, > camelExchange, false); > + CxfMessageHelper.getCxfInMessage(headerFilterStrategy, > camelExchange, false); > > inMessage.put(CxfConstants.CAMEL_EXCHANGE, camelExchange); > ((MessageImpl)inMessage).setDestination(this); > > 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/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java?rev=921743&r1=921742&r2=921743&view=diff > ============================================================================== > --- > 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; > > -//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; > > 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/java/org/apache/camel/component/cxf/util/CxfMessageHelperTest.java?p2=camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfMessageHelperTest.java&p1=camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapBindingTest.java&r1=921272&r2=921743&rev=921743&view=diff > ============================================================================== > --- > 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; > > 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; > > +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; > > -public class CxfSoapBindingTest extends Assert { > +public class CxfMessageHelperTest extends Assert { > private static final String REQUEST_STRING = > "<testMethod xmlns=\"http://camel.apache.org/testService\"/>"; > private DefaultCamelContext context = new DefaultCamelContext(); > @@ -47,7 +48,7 @@ public class CxfSoapBindingTest extends > org.apache.camel.Exchange exchange = new DefaultExchange(context); > // String > exchange.getIn().setBody("hello world"); > - org.apache.cxf.message.Message message = > CxfSoapBinding.getCxfInMessage( > + org.apache.cxf.message.Message message = > CxfMessageHelper.getCxfInMessage( > headerFilterStrategy, exchange, false); > // test message > InputStream is = message.getContent(InputStream.class); > @@ -61,14 +62,14 @@ public class CxfSoapBindingTest extends > XMLStreamReader xmlReader = > StaxUtils.createXMLStreamReader(inputStream); > DOMSource source = new DOMSource(StaxUtils.read(xmlReader)); > exchange.getIn().setBody(source); > - message = CxfSoapBinding.getCxfInMessage(headerFilterStrategy, > exchange, false); > + message = CxfMessageHelper.getCxfInMessage(headerFilterStrategy, > exchange, false); > is = message.getContent(InputStream.class); > assertNotNull("The input stream should not be null", is); > assertEquals("Don't get the right message", toString(is), > REQUEST_STRING); > > // File > exchange.getIn().setBody(requestFile); > - message = CxfSoapBinding.getCxfInMessage(headerFilterStrategy, > exchange, false); > + message = CxfMessageHelper.getCxfInMessage(headerFilterStrategy, > exchange, false); > is = message.getContent(InputStream.class); > assertNotNull("The input stream should not be null", is); > assertEquals("Don't get the right message", toString(is), > REQUEST_STRING); > > Propchange: > camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfMessageHelperTest.java > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: > camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfMessageHelperTest.java > ------------------------------------------------------------------------------ > svn:keywords = Rev Date > > Propchange: > camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfMessageHelperTest.java > ------------------------------------------------------------------------------ > svn:mergeinfo = > > Propchange: > camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/util/RequestBody.xml > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: > camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/util/RequestBody.xml > ------------------------------------------------------------------------------ > svn:keywords = Rev Date > > Propchange: > camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/util/RequestBody.xml > ------------------------------------------------------------------------------ > svn:mergeinfo = > > Propchange: > camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/util/RequestBody.xml > ------------------------------------------------------------------------------ > svn:mime-type = text/xml > >
