You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2012/06/29 04:45:38 UTC
svn commit: r1355217 - in /camel/branches/camel-2.9.x: ./
components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/
components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/
components/camel-c...
Author: ningjiang
Date: Fri Jun 29 02:45:37 2012
New Revision: 1355217
URL: http://svn.apache.org/viewvc?rev=1355217&view=rev
Log:
Merged revisions 1354863,1355003 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1354863 | ningjiang | 2012-06-28 16:52:56 +0800 (Thu, 28 Jun 2012) | 1 line
CAMEL-5405 Fix the issue of CXF Transport loses HTTP Matrix parameters
........
r1355003 | ningjiang | 2012-06-28 21:22:36 +0800 (Thu, 28 Jun 2012) | 1 line
CAMEL-5405 Added the test for DefaultCxfMessageMapperTest
........
Added:
camel/branches/camel-2.9.x/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/
- copied from r1355003, camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/
camel/branches/camel-2.9.x/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/
- copied from r1355003, camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/
camel/branches/camel-2.9.x/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
- copied unchanged from r1355003, camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/DefaultCxfMesssageMapper.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1354863,1355003
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/DefaultCxfMesssageMapper.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/DefaultCxfMesssageMapper.java?rev=1355217&r1=1355216&r2=1355217&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/DefaultCxfMesssageMapper.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/DefaultCxfMesssageMapper.java Fri Jun 29 02:45:37 2012
@@ -47,13 +47,14 @@ public class DefaultCxfMesssageMapper im
acceptContentTypes = "*/*";
}
- String enc = getCharacterEncoding(camelMessage);
+ String enc = getCharacterEncoding(camelMessage);
+ String requestURI = getRequestURI(camelMessage);
String path = getPath(camelMessage);
String basePath = getBasePath(camelExchange);
String verb = getVerb(camelMessage);
String queryString = getQueryString(camelMessage);
- answer.put(org.apache.cxf.message.Message.REQUEST_URI, path);
+ answer.put(org.apache.cxf.message.Message.REQUEST_URI, requestURI);
answer.put(org.apache.cxf.message.Message.BASE_PATH, basePath);
answer.put(org.apache.cxf.message.Message.HTTP_REQUEST_METHOD, verb);
answer.put(org.apache.cxf.message.Message.PATH_INFO, path);
@@ -116,6 +117,11 @@ public class DefaultCxfMesssageMapper im
return answer;
}
+ protected String getRequestURI(org.apache.camel.Message camelMessage) {
+ String answer = camelMessage.getHeader(Exchange.HTTP_URI, String.class);
+ return answer;
+ }
+
protected String getBasePath(Exchange camelExchange) {
String answer = camelExchange.getIn().getHeader(Exchange.HTTP_BASE_URI, String.class);