Author: ningjiang
Date: Wed Oct 22 20:36:54 2008
New Revision: 707257
URL: http://svn.apache.org/viewvc?rev=707257&view=rev
Log:
CAMEL-883 updated CXF version to 2.1.3
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapTest.java
activemq/camel/trunk/pom.xml
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java?rev=707257&r1=707256&r2=707257&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java
Wed Oct 22 20:36:54 2008
@@ -22,12 +22,16 @@
import java.util.Map;
import java.util.Set;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.MessageContext.Scope;
+
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.component.cxf.util.CxfHeaderHelper;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.helpers.CastUtils;
-import org.apache.cxf.jaxws.support.ContextPropertiesMapping;
+import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.Message;
/**
@@ -140,7 +144,7 @@
// Copy the Camel message to CXF message
public static void copyMessage(HeaderFilterStrategy strategy,
org.apache.camel.Message camelMessage,
org.apache.cxf.message.Message cxfMessage) {
-
+
CxfHeaderHelper.propagateCamelToCxf(strategy,
camelMessage.getHeaders(), cxfMessage);
try {
InputStream is = camelMessage.getBody(InputStream.class);
@@ -159,8 +163,9 @@
public static void storeCXfResponseContext(Message response, Map<String,
Object> context) {
if (context != null) {
- ContextPropertiesMapping.mapResponsefromCxf2Jaxws(context);
- response.put(Client.RESPONSE_CONTEXT, context);
+ MessageContext messageContext = new WrappedMessageContext(context,
null, Scope.HANDLER);
+ response.put(Client.RESPONSE_CONTEXT, messageContext);
+
}
}
@@ -184,7 +189,13 @@
Map<String, Object> responseContext =
CastUtils.cast((Map)message.get(Client.RESPONSE_CONTEXT));
// TODO map the JAXWS properties to cxf
if (requestContext != null) {
- ContextPropertiesMapping.mapRequestfromJaxws2Cxf(requestContext);
+ Map<String, Object> realMap = new HashMap<String, Object>();
+ WrappedMessageContext ctx = new WrappedMessageContext(realMap,
+ null,
+
Scope.APPLICATION);
+ ctx.putAll(requestContext);
+ requestContext = realMap;
+
}
if (responseContext == null) {
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=707257&r1=707256&r2=707257&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
Wed Oct 22 20:36:54 2008
@@ -72,6 +72,10 @@
}
}
+
+ protected void checkServiceClassAnnotations(Class<?> sc) {
+ // do nothing here
+ }
// do not handle any payload information here
Modified:
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapTest.java?rev=707257&r1=707256&r2=707257&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapTest.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapTest.java
Wed Oct 22 20:36:54 2008
@@ -35,7 +35,7 @@
import org.apache.cxf.io.CachedOutputStream;
import org.apache.cxf.staxutils.StaxUtils;
-public class CxfSoapTest extends ContextTestSupport {
+public class CxfSoapTest extends ContextTestSupport {
private static final String SOAP_STRING =
"<soap:Envelope
xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\";>"
+ "<soap:Body><testMethod
xmlns=\"http://camel.apache.org/testService\"; />"
Modified: activemq/camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=707257&r1=707256&r2=707257&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Wed Oct 22 20:36:54 2008
@@ -43,7 +43,7 @@
<!-- Note that activemq dependency is only used for testing! -->
<activemq-version>5.1.0</activemq-version>
<apacheds-version>1.5.4</apacheds-version>
- <cxf-version>2.1.2</cxf-version>
+ <cxf-version>2.1.3</cxf-version>
<felix-version>1.4.1</felix-version>
<felix-osgi-version>1.2.0</felix-osgi-version>
<httpcore-version>4.0-beta3</httpcore-version>
