cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r629573 - in /incubator/cxf/trunk: 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/
Date Wed, 20 Feb 2008 19:00:33 GMT
Author: dkulp
Date: Wed Feb 20 11:00:24 2008
New Revision: 629573

URL: http://svn.apache.org/viewvc?rev=629573&view=rev
Log:
[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/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIWrapperOutInterceptor.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java

Modified: incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIWrapperOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIWrapperOutInterceptor.java?rev=629573&r1=629572&r2=629573&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIWrapperOutInterceptor.java
(original)
+++ incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIWrapperOutInterceptor.java
Wed Feb 20 11:00:24 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/trunk/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/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java?rev=629573&r1=629572&r2=629573&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
(original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
Wed Feb 20 11:00:24 2008
@@ -225,6 +225,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();
@@ -233,6 +234,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);
@@ -255,6 +260,9 @@
         }
         if (isRequestResponse(method)) {
             for (MessagePartInfo part : outParts) {
+                if (isOutOfBandHeader(part) && !requireOutOfBandHeader()) {
+                    continue;
+                }
                 addParameter(method, getParameterFromPart(method, part, JavaType.Style.OUT));
             }
         }



Mime
View raw message