Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 086086869 for ; Sat, 11 Jun 2011 05:46:32 +0000 (UTC) Received: (qmail 95873 invoked by uid 500); 11 Jun 2011 05:46:31 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 95768 invoked by uid 500); 11 Jun 2011 05:46:31 -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 95760 invoked by uid 99); 11 Jun 2011 05:46:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Jun 2011 05:46:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Sat, 11 Jun 2011 05:46:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0A5812388A1C; Sat, 11 Jun 2011 05:46:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1134523 - /cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java Date: Sat, 11 Jun 2011 05:46:08 -0000 To: commits@cxf.apache.org From: ffang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110611054609.0A5812388A1C@eris.apache.org> Author: ffang Date: Sat Jun 11 05:46:08 2011 New Revision: 1134523 URL: http://svn.apache.org/viewvc?rev=1134523&view=rev Log: [CXF-3584]?wsdl does not rewrite soap:address for soap1.2 service Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java?rev=1134523&r1=1134522&r2=1134523&view=diff ============================================================================== --- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java (original) +++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java Sat Jun 11 05:46:08 2011 @@ -349,12 +349,8 @@ public class WSDLGetInterceptor extends if (name.equals(message.getExchange().getEndpoint().getEndpointInfo() .getName().getLocalPart())) { - List sadEls = DOMUtils.findAllElementsByTagNameNS(el, - "http://schemas.xmlsoap.org/wsdl/soap/", - "address"); - for (Element soapAddress : sadEls) { - soapAddress.setAttribute("location", base); - } + rewriteAddress(base, el, "http://schemas.xmlsoap.org/wsdl/soap/"); + rewriteAddress(base, el, "http://schemas.xmlsoap.org/wsdl/soap12/"); } } } @@ -367,6 +363,15 @@ public class WSDLGetInterceptor extends } } + private void rewriteAddress(String base, Element el, String soapNS) { + List sadEls = DOMUtils.findAllElementsByTagNameNS(el, + soapNS, + "address"); + for (Element soapAddress : sadEls) { + soapAddress.setAttribute("location", base); + } + } + static String resolveWithCatalogs(OASISCatalogManager catalogs, String start, String base) { try { return new OASISCatalogManagerHelper().resolve(catalogs, start, base);