svn commit: r997944 - in /cxf/trunk: rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java

[dkulp]

Author: dkulp
Date: Thu Sep 16 23:02:15 2010
New Revision: 997944

URL: http://svn.apache.org/viewvc?rev=997944&view=rev
Log:
[CXF-2998,CXF-3000] Fix issues with out of band headers not being mapped
to parameters correctly.

Modified:
    
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
    
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java

Modified: 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?rev=997944&r1=997943&r2=997944&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
 Thu Sep 16 23:02:15 2010
@@ -235,7 +235,9 @@ public class JaxWsServiceConfiguration e
         String tns = mi.getName().getNamespaceURI();
         String local = null;
         if (param != null) {
-            if (Boolean.TRUE.equals(isRPC(method)) || isDocumentBare(method)) {
+            if (Boolean.TRUE.equals(isRPC(method)) 
+                || isDocumentBare(method)
+                || param.header()) {
                 local = param.partName();
             }
             if (local == null || local.length() == 0) {

Modified: 
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java?rev=997944&r1=997943&r2=997944&view=diff
==============================================================================
--- 
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
 (original)
+++ 
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
 Thu Sep 16 23:02:15 2010
@@ -429,6 +429,7 @@ public class ServiceProcessor extends Ab
         parameterAnnotation.addElement(new JAnnotationElement("header", true, 
true));
         parameterAnnotation.addElement(new JAnnotationElement("name", 
                                                                      
parameter.getQName().getLocalPart()));
+        parameterAnnotation.addElement(new JAnnotationElement("partName", 
parameter.getPartName()));
         parameterAnnotation.addElement(new 
JAnnotationElement("targetNamespace", 
                                                                      
parameter.getTargetNamespace()));
     }