svn commit: r1134858 - in /cxf/branches/2.4.x-fixes: ./ rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java

[ningjiang]

Author: ningjiang
Date: Sun Jun 12 03:30:31 2011
New Revision: 1134858

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

........
  r1134523 | ffang | 2011-06-11 13:46:08 +0800 (Sat, 11 Jun 2011) | 1 line
  
  [CXF-3584]?wsdl does not rewrite soap:address for soap1.2 service
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    
cxf/branches/2.4.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 12 03:30:31 2011
@@ -1 +1 @@
-/cxf/trunk:1134248,1134281
+/cxf/trunk:1134248,1134281,1134523

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Jun 12 03:30:31 2011
@@ -1 +1 @@
-/cxf/trunk:1-1134023,1134142,1134248,1134281
+/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523

Modified: 
cxf/branches/2.4.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java?rev=1134858&r1=1134857&r2=1134858&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java
 Sun Jun 12 03:30:31 2011
@@ -349,12 +349,8 @@ public class WSDLGetInterceptor extends 
                         if 
(name.equals(message.getExchange().getEndpoint().getEndpointInfo()
                                             .getName().getLocalPart())) {
                             
-                            List<Element> 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<Element> 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);