You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/01/20 22:46:23 UTC
svn commit: r1234160 - in /camel/branches/camel-2.9.x: ./
components/camel-cxf-transport/
components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/
components/camel-cxf-transport/src/main/java/org/apache/camel/component...
Author: hadrian
Date: Fri Jan 20 21:46:22 2012
New Revision: 1234160
URL: http://svn.apache.org/viewvc?rev=1234160&view=rev
Log:
Merged revisions 1229571 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1229571 | dkulp | 2012-01-10 09:56:31 -0500 (Tue, 10 Jan 2012) | 1 line
Fix compiler warnings in camel-cxf-transport
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-cxf-transport/pom.xml
camel/branches/camel-2.9.x/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelper.java
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/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/components/camel-cxf-transport/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf-transport/pom.xml?rev=1234160&r1=1234159&r2=1234160&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf-transport/pom.xml (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf-transport/pom.xml Fri Jan 20 21:46:22 2012
@@ -171,6 +171,10 @@
<wsdl>${basedir}/src/test/resources/person.wsdl</wsdl>
</wsdlOption>
</wsdlOptions>
+ <defaultOptions>
+ <markGenerated>true</markGenerated>
+ <faultSerialVersionUID>1</faultSerialVersionUID>
+ </defaultOptions>
</configuration>
<goals>
<goal>wsdl2java</goal>
Modified: camel/branches/camel-2.9.x/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelper.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/header/CxfHeaderHelper.java?rev=1234160&r1=1234159&r2=1234160&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelper.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelper.java Fri Jan 20 21:46:22 2012
@@ -52,7 +52,7 @@ public final class CxfHeaderHelper {
Map<String, Object> headers, Message message, Exchange exchange) {
Map<String, List<String>> cxfHeaders =
- CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
+ CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
if (cxfHeaders == null) {
// use a treemap to keep ordering and ignore key case
@@ -88,7 +88,7 @@ public final class CxfHeaderHelper {
// Copy the CXF protocol headers to the camel headers
Map<String, List<String>> cxfHeaders =
- CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
+ CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
if (cxfHeaders != null) {
for (Map.Entry<String, List<String>> entry : cxfHeaders.entrySet()) {
if (!strategy.applyFilterToExternalHeaders(entry.getKey(), entry.getValue(), exchange)) {
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=1234160&r1=1234159&r2=1234160&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 Jan 20 21:46:22 2012
@@ -82,7 +82,7 @@ public class DefaultCxfMesssageMapper im
Map<String, Object> camelHeaders = exchange.getOut().getHeaders();
Map<String, List<String>> cxfHeaders =
- CastUtils.cast((Map)cxfMessage.get(Message.PROTOCOL_HEADERS));
+ CastUtils.cast((Map<?, ?>)cxfMessage.get(Message.PROTOCOL_HEADERS));
if (cxfHeaders != null) {
for (Map.Entry<String, List<String>> entry : cxfHeaders.entrySet()) {