Author: ningjiang
Date: Mon Jul 21 01:56:39 2008
New Revision: 678367
URL: http://svn.apache.org/viewvc?rev=678367&view=rev
Log:
CAMEL-739 set the content type property in the camel transport
Added:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportConstants.java
- copied, changed from r678337,
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConstants.java
Removed:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConstants.java
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapBinding.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-applicationContext.xml
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapBinding.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapBinding.java?rev=678367&r1=678366&r2=678367&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapBinding.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapBinding.java
Mon Jul 21 01:56:39 2008
@@ -25,6 +25,7 @@
import javax.xml.transform.Source;
+import org.apache.camel.component.cxf.transport.CamelTransportConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.cxf.helpers.CastUtils;
@@ -63,6 +64,7 @@
}
answer.put(Message.PROTOCOL_HEADERS, getProtocolHeader(headers));
+ answer.put(Message.CONTENT_TYPE,
headers.get(CamelTransportConstants.CONTENT_TYPE));
Object body = message.getBody(InputStream.class);
if (body instanceof InputStream) {
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java?rev=678367&r1=678366&r2=678367&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
Mon Jul 21 01:56:39 2008
@@ -165,7 +165,9 @@
CachedOutputStream outputStream =
(CachedOutputStream)outMessage.getContent(OutputStream.class);
// Send out the request message here, copy the
protocolHeader back
Map<String, List<String>> protocolHeader =
CastUtils.cast((Map<?, ?>)outMessage.get(Message.PROTOCOL_HEADERS));
+ String contentType = (String)
outMessage.get(Message.CONTENT_TYPE);
CxfSoapBinding.setProtocolHeader(ex.getIn().getHeaders(),
protocolHeader);
+ ex.getIn().setHeader(CamelTransportConstants.CONTENT_TYPE,
contentType);
ex.getIn().setBody(outputStream.getBytes());
getLogger().log(Level.FINE, "template sending request: ",
ex.getIn());
}
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java?rev=678367&r1=678366&r2=678367&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
Mon Jul 21 01:56:39 2008
@@ -248,6 +248,7 @@
Exchange camelExchange =
(Exchange)outMessage.get(CxfConstants.CAMEL_EXCHANGE);
Map<String, List<String>> protocolHeader = CastUtils.cast((Map<?,
?>)outMessage.get(Message.PROTOCOL_HEADERS));
CxfSoapBinding.setProtocolHeader(camelExchange.getOut().getHeaders(),
protocolHeader);
+
camelExchange.getOut().setHeader(CamelTransportConstants.CONTENT_TYPE,
outMessage.get(Message.CONTENT_TYPE));
CachedOutputStream outputStream =
(CachedOutputStream)outMessage.getContent(OutputStream.class);
camelExchange.getOut().setBody(outputStream.getBytes());
getLogger().log(Level.FINE, "send the response message: " +
outputStream);
Copied:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportConstants.java
(from r678337,
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConstants.java)
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportConstants.java?p2=activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportConstants.java&p1=activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConstants.java&r1=678337&r2=678367&rev=678367&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConstants.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportConstants.java
Mon Jul 21 01:56:39 2008
@@ -19,7 +19,7 @@
/**
* @version $Revision$
*/
-public final class CamelConstants {
+public final class CamelTransportConstants {
public static final String TEXT_MESSAGE_TYPE = "text";
public static final String BINARY_MESSAGE_TYPE = "binary";
@@ -46,8 +46,9 @@
public static final String CAMEL_SERVER_CONFIG_ID = "camel-server";
public static final String CAMEL_REBASED_REPLY_TO =
"org.apache.cxf.camel.server.replyto";
public static final String CAMEL_CORRELATION_ID =
"org.apache.cxf.camel.correlationId";
+ public static final String CONTENT_TYPE = "content.type";
- private CamelConstants() {
+ private CamelTransportConstants() {
// Utility class
}
}
Modified:
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-applicationContext.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-applicationContext.xml?rev=678367&r1=678366&r2=678367&view=diff
==============================================================================
---
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-applicationContext.xml
(original)
+++
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-applicationContext.xml
Mon Jul 21 01:56:39 2008
@@ -25,7 +25,7 @@
<import resource="classpath:META-INF/cxf/cxf.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-camel.xml" />
-
+
<import resource="classpath:spring-config/jms-applicationContext.xml" />
<client id="org.apache.camel.itest.customerrelations.CustomerServiceV1"
@@ -35,7 +35,9 @@
endpointName="customer:CustomerServiceV1CamelPort"
serviceClass="org.apache.camel.itest.customerrelations.CustomerServiceV1"
address="camel://direct:clientOutbound">
-
+ <properties>
+ <entry xmlns="http://www.springframework.org/schema/beans";
key="mtom-enabled" value="true" />
+ </properties>
<features>
<!-- Enables logging of SOAP messages. -->
<logging xmlns="http://cxf.apache.org/core"; />
Modified:
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml?rev=678367&r1=678366&r2=678367&view=diff
==============================================================================
---
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml
(original)
+++
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml
Mon Jul 21 01:56:39 2008
@@ -44,6 +44,9 @@
endpointName="customer:CustomerServiceV1CamelPort"
address="camel://direct:serverInbound"
implementor="org.apache.camel.itest.customerrelations.CustomerServiceV1Impl">
+ <properties>
+ <entry
xmlns="http://www.springframework.org/schema/beans"; key="mtom-enabled"
value="true" />
+ </properties>
<features>
<!-- Enables logging of SOAP messages. -->
<logging xmlns="http://cxf.apache.org/core"; />
