Author: ningjiang
Date: Mon May 19 23:33:34 2008
New Revision: 658119
URL: http://svn.apache.org/viewvc?rev=658119&view=rev
Log:
CAMEL-497 upgraded CXF version from 2.0.5 to 2.0.6, also fixed some camel-cxf
component bugs
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/DOMInInterceptor.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java
activemq/camel/trunk/pom.xml
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java?rev=658119&r1=658118&r2=658119&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
Mon May 19 23:33:34 2008
@@ -35,8 +35,9 @@
*/
public class PayLoadDataFormatFeature extends AbstractDataFormatFeature {
private static final Logger LOG =
LogUtils.getL7dLogger(MessageDataFormatFeature.class);
- // filiter the unused phase
+ // filter the unused phase
private static final String[] REMOVING_IN_PHASES = {Phase.UNMARSHAL,
Phase.PRE_LOGICAL, Phase.PRE_LOGICAL_ENDING, Phase.POST_LOGICAL,
Phase.POST_LOGICAL_ENDING };
+
private static final String[] REMOVING_OUT_PHASES = {Phase.MARSHAL,
Phase.MARSHAL_ENDING, Phase.PRE_LOGICAL, Phase.PRE_LOGICAL_ENDING,
Phase.POST_LOGICAL, Phase.POST_LOGICAL_ENDING };
@Override
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/DOMInInterceptor.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/DOMInInterceptor.java?rev=658119&r1=658118&r2=658119&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/DOMInInterceptor.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/DOMInInterceptor.java
Mon May 19 23:33:34 2008
@@ -20,6 +20,7 @@
import java.util.logging.Logger;
import org.apache.cxf.binding.soap.SoapMessage;
+import org.apache.cxf.binding.soap.interceptor.CheckFaultInterceptor;
import org.apache.cxf.binding.soap.interceptor.SoapActionInInterceptor;
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.logging.LogUtils;
@@ -34,8 +35,8 @@
private final XMLMessageInInterceptor xmlInterceptor = new
XMLMessageInInterceptor();
private final SoapMessageInInterceptor soapInterceptor = new
SoapMessageInInterceptor();
public DOMInInterceptor() {
- super(Phase.READ);
- this.addAfter(SoapActionInInterceptor.class.getName());
+ super(Phase.POST_PROTOCOL);
+ this.addAfter(CheckFaultInterceptor.class.getName());
}
public boolean isRequestor(Message message) {
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java?rev=658119&r1=658118&r2=658119&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java
Mon May 19 23:33:34 2008
@@ -19,10 +19,12 @@
import javax.xml.namespace.QName;
import org.apache.cxf.binding.AbstractBindingFactory;
+import org.apache.cxf.binding.soap.interceptor.CheckFaultInterceptor;
import org.apache.cxf.binding.soap.interceptor.MustUnderstandInterceptor;
import org.apache.cxf.binding.soap.interceptor.ReadHeadersInterceptor;
import org.apache.cxf.binding.soap.interceptor.SoapActionInInterceptor;
import org.apache.cxf.binding.soap.interceptor.SoapActionOutInterceptor;
+import org.apache.cxf.binding.soap.interceptor.SoapHeaderInterceptor;
import org.apache.cxf.binding.soap.interceptor.SoapHeaderOutFilterInterceptor;
import org.apache.cxf.binding.soap.interceptor.SoapOutInterceptor;
import org.apache.cxf.binding.soap.interceptor.SoapPreProtocolOutInterceptor;
@@ -30,6 +32,7 @@
import org.apache.cxf.interceptor.AttachmentOutInterceptor;
import org.apache.cxf.interceptor.StaxInInterceptor;
import org.apache.cxf.interceptor.StaxOutInterceptor;
+import org.apache.cxf.interceptor.URIMappingInterceptor;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.model.EndpointInfo;
@@ -77,7 +80,9 @@
getService().getInInterceptors().add(new
ReadHeadersInterceptor(getBus()));
getService().getInInterceptors().add(new MustUnderstandInterceptor());
getService().getInInterceptors().add(new AttachmentInInterceptor());
-
+ getService().getInInterceptors().add(new SoapHeaderInterceptor());
+ getService().getInInterceptors().add(new CheckFaultInterceptor());
+ getService().getInInterceptors().add(new URIMappingInterceptor());
getService().getInInterceptors().add(new StaxInInterceptor());
getService().getInInterceptors().add(new SoapActionInInterceptor());
Modified: activemq/camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=658119&r1=658118&r2=658119&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Mon May 19 23:33:34 2008
@@ -37,7 +37,7 @@
<!-- Note that this dependency is only used for testing! -->
<activemq-version>5.0.0</activemq-version>
<compiler.fork>false</compiler.fork>
- <cxf-version>2.0.5-incubator</cxf-version>
+ <cxf-version>2.0.6</cxf-version>
<felix-version>1.4.0</felix-version>
<geronimo-spec-version>1.1</geronimo-spec-version>
<httpcore-version>4.0-alpha6</httpcore-version>
