cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r630067 - in /incubator/cxf/branches/2.0.x-fixes: ./ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
Date Fri, 22 Feb 2008 02:05:29 GMT
Author: dkulp
Date: Thu Feb 21 18:05:24 2008
New Revision: 630067

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

........
  r630066 | dkulp | 2008-02-21 20:58:18 -0500 (Thu, 21 Feb 2008) | 3 lines
  
  Remove complicated xpath code that is not needed to find the wsdl:definition node that would
always be the root node anyway.
  Has the side effect of fixing CXF-1439
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java

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

Modified: incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.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/customization/CustomizationParser.java?rev=630067&r1=630066&r2=630067&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
Thu Feb 21 18:05:24 2008
@@ -252,16 +252,25 @@
         }
 
         if (isGlobaleBindings(bindings)) {
-            String pfx = targetNode.getPrefix();
-            if (pfx == null) {
-                pfx = "";
-            } else {
-                pfx += ":";
-            }
-
             nodeSelector.addNamespaces(wsdlNode);
+            if (targetNode != wsdlNode) {
+                nodeSelector.addNamespaces(targetNode);
+            }
+            /*
+            String pfx = nodeSelector.getNamespaceContext().getPrefix(targetNode.getNamespaceURI());
+            int count = 0;
+            while (StringUtils.isEmpty(pfx)) {
+                pfx = "wsdl" + (count == 0 ? "" : count);
+                if (nodeSelector.getNamespaceContext().getNamespaceURI(pfx) != null) {
+                    count++;
+                }
+            }
+            pfx += ":";
             Node node = nodeSelector.queryNode(targetNode, "//" + pfx + "definitions");
-            copyBindingsToWsdl(node, bindings, nodeSelector.getNamespaceContext());
+            */
+
+            
+            copyBindingsToWsdl(targetNode, bindings, nodeSelector.getNamespaceContext());
         }
 
         if (isJAXWSBindings(bindings) && bindings.getAttributeNode("node") != null)
{



Mime
View raw message