Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 91379 invoked from network); 16 Sep 2010 23:10:14 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 16 Sep 2010 23:10:14 -0000 Received: (qmail 39672 invoked by uid 500); 16 Sep 2010 23:10:14 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 39552 invoked by uid 500); 16 Sep 2010 23:10:13 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 39545 invoked by uid 99); 16 Sep 2010 23:10:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Sep 2010 23:10:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Sep 2010 23:10:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BE65A2388A38; Thu, 16 Sep 2010 23:09:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/ Date: Thu, 16 Sep 2010 23:09:52 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100916230952.BE65A2388A38@eris.apache.org> 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())); }