cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r735821 - in /cxf/branches/2.0.x-fixes: ./ rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/
Date Mon, 19 Jan 2009 21:15:28 GMT
Author: dkulp
Date: Mon Jan 19 13:15:27 2009
New Revision: 735821

URL: http://svn.apache.org/viewvc?rev=735821&view=rev
Log:
Merged revisions 731686 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes

................
  r731686 | dkulp | 2009-01-05 15:19:51 -0500 (Mon, 05 Jan 2009) | 9 lines
  
  Merged revisions 731604 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r731604 | seanoc | 2009-01-05 10:58:18 -0500 (Mon, 05 Jan 2009) | 1 line
    
    Removed more uses of NodeList
  ........
................

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
    cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 19 13:15:27 2009
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,733587
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,733582
+/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686,733587
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,733582
 /incubator/cxf/trunk:434594-651668

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

Modified: cxf/branches/2.0.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java?rev=735821&r1=735820&r2=735821&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
Mon Jan 19 13:15:27 2009
@@ -37,6 +37,7 @@
 import org.apache.cxf.binding.soap.interceptor.CheckFaultInterceptor;
 import org.apache.cxf.binding.soap.interceptor.ReadHeadersInterceptor;
 import org.apache.cxf.headers.Header;
+import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.interceptor.StaxInInterceptor;
 import org.apache.cxf.message.Attachment;
 import org.junit.Before;
@@ -104,11 +105,10 @@
             if (ele.getLocalName().equals("reservation")) {
                 Element reservation = ele;
                 List<Element> reservationChilds = new ArrayList<Element>();
-                for (int j = 0; j < reservation.getChildNodes().getLength(); j++) {
-                    if (reservation.getChildNodes().item(j) instanceof Element) {
-                        Element element = (Element)reservation.getChildNodes().item(j);
-                        reservationChilds.add(element);
-                    }
+                Element elem = DOMUtils.getFirstElement(reservation);
+                while (elem != null) {
+                    reservationChilds.add(elem);
+                    elem = DOMUtils.getNextElement(elem);
                 }
                 assertEquals(2, reservationChilds.size());
                 assertEquals("reference", reservationChilds.get(0).getLocalName());
@@ -122,13 +122,8 @@
             if (ele.getLocalName().equals("passenger")) {
                 Element passenger = ele;
                 assertNotNull(passenger);
-                Element child = null;
-                for (int j = 0; j < passenger.getChildNodes().getLength(); j++) {
-                    if (passenger.getChildNodes().item(j) instanceof Element) {
-                        child = (Element)passenger.getChildNodes().item(j);
-                    }
-                }
-                assertNotNull("passenger should has child element", child);             
  
+                Element child = DOMUtils.getFirstElement(passenger);
+                assertNotNull("passenger should have a child element", child);          
     
                 assertEquals("name", child.getLocalName());
                 assertEquals("Bob", child.getTextContent());
             }

Modified: 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/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java?rev=735821&r1=735820&r2=735821&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
(original)
+++ cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
Mon Jan 19 13:15:27 2009
@@ -248,11 +248,13 @@
             
             Element childEl = (Element)childNode;
             if (isJaxbBindingsElement(childEl)) {
+                
                 NodeList nlist = nodeSelector.queryNodes(schemaNode, childEl.getAttribute("node"));
                 for (int i = 0; i < nlist.getLength(); i++) {
                     Node node = nlist.item(i);
                     copyAllJaxbDeclarations(node, childEl);
-                }
+                }              
+                
             } else {
                 Element cloneNode = (Element)ProcessorUtil.cloneNode(schemaNode.getOwnerDocument(),

                                                                      childEl, true);
@@ -270,9 +272,9 @@
                 childNode = childNode.getNextSibling();
             }
         }
-
-        if (schemaNode.getChildNodes().getLength() > 0) {
-            schemaNode.insertBefore(annotationNode, schemaNode.getChildNodes().item(0));
+        
+        if (schemaNode.getFirstChild() != null) {
+            schemaNode.insertBefore(annotationNode, schemaNode.getFirstChild());
         } else {
             schemaNode.appendChild(annotationNode);
         }
@@ -383,13 +385,17 @@
 
         }
 
-        for (int i = 0; i < bindings.getChildNodes().getLength(); i++) {
-            Node childNode = bindings.getChildNodes().item(i);
-            if (childNode.getNodeType() == Element.ELEMENT_NODE
-                && childNode.getNamespaceURI().equals(ToolConstants.JAXWS_BINDINGS.getNamespaceURI()))
{
-                childNode.setPrefix("jaxws");
+        
+        
+        Element element = DOMUtils.getFirstElement(bindings);
+        while (element != null) {
+            if (element.getNamespaceURI().equals(ToolConstants.JAXWS_BINDINGS.getNamespaceURI()))
{
+                element.setPrefix("jaxws");
             }
+            element = DOMUtils.getNextElement(element);
         }
+        
+        
 
         Node cloneNode = ProcessorUtil.cloneNode(node.getOwnerDocument(), bindings, true);
         Node firstChild = DOMUtils.getChild(node, "jaxws:bindings");



Mime
View raw message