svn commit: r1181905 - in /cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn: AbstractCreatePullPoint.java util/DOMUtil.java util/WSNHelper.java

[dk...@apache.org]

Author: dkulp
Date: Tue Oct 11 17:23:44 2011
New Revision: 1181905

URL: http://svn.apache.org/viewvc?rev=1181905&view=rev
Log:
Use CXF DOMUtils

Removed:
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/util/DOMUtil.java
Modified:
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractCreatePullPoint.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java

Modified: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractCreatePullPoint.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractCreatePullPoint.java?rev=1181905&r1=1181904&r2=1181905&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractCreatePullPoint.java (original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractCreatePullPoint.java Tue Oct 11 17:23:44 2011
@@ -32,7 +32,7 @@ import javax.jws.WebService;
 import org.w3c.dom.Element;
 
 import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.wsn.util.DOMUtil;
+import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.wsn.util.IdGenerator;
 import org.oasis_open.docs.wsn.b_2.CreatePullPointResponse;
 import org.oasis_open.docs.wsn.b_2.UnableToCreatePullPointFaultType;
@@ -119,7 +119,7 @@ public abstract class AbstractCreatePull
             Element el = (Element) it.next();
             if ("name".equals(el.getLocalName())
                     && "http://cxf.apache.org/wsn2005/1.0".equals(el.getNamespaceURI())) {
-                name = DOMUtil.getElementText(el).trim();
+                name = DOMUtils.getContent(el).trim();
             }
         }
         if (name == null) {

Modified: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java?rev=1181905&r1=1181904&r2=1181905&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java (original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/util/WSNHelper.java Tue Oct 11 17:23:44 2011
@@ -19,7 +19,6 @@
 package org.apache.cxf.wsn.util;
 
 import javax.xml.namespace.QName;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.ws.EndpointReference;
 import javax.xml.ws.Service;
@@ -29,6 +28,8 @@ import javax.xml.ws.wsaddressing.W3CEndp
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
+import org.apache.cxf.helpers.DOMUtils;
+
 public abstract class WSNHelper {
 
     public static <T> T getPort(EndpointReference ref, Class<T> serviceInterface) {
@@ -54,16 +55,12 @@ public abstract class WSNHelper {
     }
 
     public static String getWSAAddress(W3CEndpointReference ref) {
-        try {
-            Element element = DOMUtil.newDocument().createElement("elem");
-            ref.writeTo(new DOMResult(element));
-            NodeList nl = element.getElementsByTagNameNS("http://www.w3.org/2005/08/addressing", "Address");
-            if (nl != null && nl.getLength() > 0) {
-                Element e = (Element) nl.item(0);
-                return DOMUtil.getElementText(e).trim();
-            }
-        } catch (ParserConfigurationException e) {
-            // Ignore
+        Element element = DOMUtils.createDocument().createElement("elem");
+        ref.writeTo(new DOMResult(element));
+        NodeList nl = element.getElementsByTagNameNS("http://www.w3.org/2005/08/addressing", "Address");
+        if (nl != null && nl.getLength() > 0) {
+            Element e = (Element) nl.item(0);
+            return DOMUtils.getContent(e).trim();
         }
         return null;
     }