svn commit: r1530638 - in /cxf/trunk/rt: frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/ ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/

[dkulp]

Author: dkulp
Date: Wed Oct  9 14:39:53 2013
New Revision: 1530638

URL: http://svn.apache.org/r1530638
Log:
[CXF-5326] Fix references to the wrong DOMUtils

Modified:
    
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
    
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/ReferenceParametersAssertingHandler.java
    
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/WSAActionAssertingHandler.java

Modified: 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java?rev=1530638&r1=1530637&r2=1530638&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
 Wed Oct  9 14:39:53 2013
@@ -44,12 +44,11 @@ import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import com.ibm.wsdl.util.xml.DOMUtils;
-
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.binding.soap.saaj.SAAJFactoryResolver;
 import org.apache.cxf.binding.soap.saaj.SAAJUtils;
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.io.CachedOutputStream;
 import org.apache.cxf.message.Message;
@@ -205,7 +204,7 @@ public class LogicalMessageImpl implemen
                 } else {
                     s = new DOMSource(SAAJUtils.getBody(m).getFirstChild());
                 }
-                W3CDOMStreamReader r = new 
W3CDOMStreamReader(DOMUtils.getFirstChildElement(SAAJUtils.getBody(m)));
+                W3CDOMStreamReader r = new 
W3CDOMStreamReader(DOMUtils.getFirstElement(SAAJUtils.getBody(m)));
                 message.setContent(XMLStreamReader.class, r);
             } catch (Exception e) {
                 throw new Fault(e);

Modified: 
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/ReferenceParametersAssertingHandler.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/ReferenceParametersAssertingHandler.java?rev=1530638&r1=1530637&r2=1530638&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/ReferenceParametersAssertingHandler.java
 (original)
+++ 
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/ReferenceParametersAssertingHandler.java
 Wed Oct  9 14:39:53 2013
@@ -20,6 +20,7 @@
 package org.apache.cxf.ws.eventing.integration.notificationapi.assertions;
 
 import java.util.Set;
+
 import javax.xml.bind.JAXBElement;
 import javax.xml.namespace.QName;
 import javax.xml.soap.SOAPException;
@@ -29,8 +30,7 @@ import javax.xml.ws.handler.soap.SOAPMes
 
 import org.w3c.dom.Element;
 
-import com.ibm.wsdl.util.xml.DOMUtils;
-
+import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.ws.addressing.ReferenceParametersType;
 
 public class ReferenceParametersAssertingHandler implements 
SOAPHandler<SOAPMessageContext> {
@@ -59,7 +59,7 @@ public class ReferenceParametersAssertin
             for (Object exp : params.getAny()) {
                 JAXBElement<?> expectedElement = (JAXBElement<?>)exp;
                 boolean found = false;
-                Element actualHeaderelement = 
DOMUtils.getFirstChildElement(context.getMessage().getSOAPHeader());
+                Element actualHeaderelement = 
DOMUtils.getFirstElement(context.getMessage().getSOAPHeader());
                 while (actualHeaderelement != null) {
                     if 
(expectedElement.getName().getLocalPart().equals(actualHeaderelement.getLocalName())
                             && expectedElement.getName().getNamespaceURI()
@@ -67,7 +67,7 @@ public class ReferenceParametersAssertin
                         found = true;
                         break;
                     }
-                    actualHeaderelement = 
DOMUtils.getNextSiblingElement(actualHeaderelement);
+                    actualHeaderelement = 
DOMUtils.getNextElement(actualHeaderelement);
                 }
                 if (!found) {
                     throw new RuntimeException("Event sink should have 
received Reference parameter: "

Modified: 
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/WSAActionAssertingHandler.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/WSAActionAssertingHandler.java?rev=1530638&r1=1530637&r2=1530638&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/WSAActionAssertingHandler.java
 (original)
+++ 
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/WSAActionAssertingHandler.java
 Wed Oct  9 14:39:53 2013
@@ -20,6 +20,7 @@
 package org.apache.cxf.ws.eventing.integration.notificationapi.assertions;
 
 import java.util.Set;
+
 import javax.xml.namespace.QName;
 import javax.xml.soap.SOAPException;
 import javax.xml.ws.handler.MessageContext;
@@ -28,7 +29,7 @@ import javax.xml.ws.handler.soap.SOAPMes
 
 import org.w3c.dom.Element;
 
-import com.ibm.wsdl.util.xml.DOMUtils;
+import org.apache.cxf.helpers.DOMUtils;
 
 /**
  * Handler that asserts a particular value of WS-Addressing Action in the 
headers
@@ -58,7 +59,7 @@ public class WSAActionAssertingHandler i
             return true;
         }
         try {
-            Element elm = 
DOMUtils.getFirstChildElement(context.getMessage().getSOAPHeader());
+            Element elm = 
DOMUtils.getFirstElement(context.getMessage().getSOAPHeader());
             while (elm != null) {
                 if (elm.getTagName().equals("Action") && 
elm.getNamespaceURI().contains("addressing")) {
                     if (!elm.getTextContent().equals(action)) {
@@ -68,7 +69,7 @@ public class WSAActionAssertingHandler i
                     }
                     return true;
                 }
-                elm = DOMUtils.getNextSiblingElement(elm);
+                elm = DOMUtils.getNextElement(elm);
             }
         } catch (SOAPException e) {
             throw new RuntimeException(e);