svn commit: r997948 - in /cxf/branches/2.2.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/

[dkulp]

Author: dkulp
Date: Thu Sep 16 23:09:52 2010
New Revision: 997948

URL: http://svn.apache.org/viewvc?rev=997948&view=rev
Log:
Merged revisions 997944 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r997944 | dkulp | 2010-09-16 19:02:15 -0400 (Thu, 16 Sep 2010) | 2 lines
  
  [CXF-2998,CXF-3000] Fix issues with out of band headers not being mapped
  to parameters correctly.
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
    
cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?rev=997948&r1=997947&r2=997948&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
 Thu Sep 16 23:09:52 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/branches/2.2.x-fixes/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/branches/2.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java?rev=997948&r1=997947&r2=997948&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
 Thu Sep 16 23:09:52 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()));
     }