svn commit: r629576 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/

[dkulp]

Author: dkulp
Date: Wed Feb 20 11:13:58 2008
New Revision: 629576

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

........
  r629573 | dkulp | 2008-02-20 14:00:24 -0500 (Wed, 20 Feb 2008) | 3 lines
  
  [CXF-1020, CXF-907, CXF-1444] Don't process the extended soap headers on 
output parts unless asked too
  Fix problems with JBIWrapperOutInterceptor not properly using part indexes
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    
incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIWrapperOutInterceptor.java
    
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java

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

Modified: 
incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIWrapperOutInterceptor.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIWrapperOutInterceptor.java?rev=629576&r1=629575&r2=629576&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIWrapperOutInterceptor.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIWrapperOutInterceptor.java
 Wed Feb 20 11:13:58 2008
@@ -72,7 +72,7 @@
             }
             for (int idx = 0; idx < parts.size(); idx++) {
                 MessagePartInfo part = parts.get(idx);
-                Object obj = objs.get(idx);
+                Object obj = objs.get(part.getIndex());
                 if (!part.isElement()) {
                     if (part.getTypeClass() == String.class) {
                         
xmlWriter.writeStartElement(JBIConstants.NS_JBI_WRAPPER, 

Modified: 
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java?rev=629576&r1=629575&r2=629576&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
 Wed Feb 20 11:13:58 2008
@@ -214,6 +214,7 @@
 
     private void processOutput(JavaMethod method, MessageInfo inputMessage, 
MessageInfo outputMessage)
         throws ToolException {
+                        
         Map<QName, MessagePartInfo> inputPartsMap = 
inputMessage.getMessagePartsMap();
         List<MessagePartInfo> outputParts =
             outputMessage == null ? new ArrayList<MessagePartInfo>() : 
outputMessage.getMessageParts();
@@ -222,6 +223,10 @@
         if (isRequestResponse(method)) {
 
             for (MessagePartInfo outpart : outputParts) {
+                if (isOutOfBandHeader(outpart) && !requireOutOfBandHeader()) {
+                    continue;
+                }
+                
                 MessagePartInfo inpart = inputPartsMap.get(outpart.getName());
                 if (inpart == null) {
                     outParts.add(outpart);
@@ -244,6 +249,9 @@
         }
         if (isRequestResponse(method)) {
             for (MessagePartInfo part : outParts) {
+                if (isOutOfBandHeader(part) && !requireOutOfBandHeader()) {
+                    continue;
+                }
                 addParameter(method, getParameterFromPart(part, 
JavaType.Style.OUT));
             }
         }