svn commit: r1519825 [2/2] - in /cxf/branches/2.7.x-fixes: api/src/test/java/org/apache/cxf/staxutils/ rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ rt/core/src/main/java/org/apache/cxf/service/factory/ rt/core/src/main/java/o...

[dkulp]

Modified: 
cxf/branches/2.7.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java?rev=1519825&r1=1519824&r2=1519825&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java
 Tue Sep  3 20:00:41 2013
@@ -31,7 +31,6 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 import org.apache.cxf.attachment.AttachmentDeserializer;
-import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
 import org.apache.cxf.message.Attachment;
@@ -39,6 +38,7 @@ import org.apache.cxf.message.ExchangeIm
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.service.model.EndpointInfo;
+import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.cxf.test.TestUtilities;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.TestUtil;
@@ -104,11 +104,11 @@ public class MtomPolicyTest extends Abst
         WSPolicyFeature policyFeature = new WSPolicyFeature();
         List<Element> policyElements = new ArrayList<Element>();
         if (mtomRequired) {
-            policyElements.add(DOMUtils.readXml(
+            policyElements.add(StaxUtils.read(
                 getClass().getResourceAsStream("mtom-policy.xml"))
                            .getDocumentElement());
         } else {
-            policyElements.add(DOMUtils.readXml(
+            policyElements.add(StaxUtils.read(
                 getClass().getResourceAsStream("mtom-policy-optional.xml"))
                            .getDocumentElement());
         } 

Modified: 
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java?rev=1519825&r1=1519824&r2=1519825&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
 Tue Sep  3 20:00:41 2013
@@ -36,6 +36,7 @@ import org.apache.cxf.frontend.ClientPro
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.service.model.MessageInfo.Type;
+import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
 import org.apache.cxf.systest.ws.policy.javafirst.BindingSimpleService;
 import 
org.apache.cxf.systest.ws.policy.javafirst.NoAlternativesOperationSimpleService;
@@ -486,7 +487,7 @@ public class JavaFirstPolicyServiceTest 
         String wsdlContents = IOUtils.toString(is);
 
         // System.out.println(wsdlContents);
-        return DOMUtils.readXml(new StringReader(wsdlContents));
+        return StaxUtils.read(new StringReader(wsdlContents));
     }
 
     private String getPolicyId(Element element) {

Modified: 
cxf/branches/2.7.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxb/CustomizationParser.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxb/CustomizationParser.java?rev=1519825&r1=1519824&r2=1519825&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxb/CustomizationParser.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxb/CustomizationParser.java
 Tue Sep  3 20:00:41 2013
@@ -39,7 +39,6 @@ import org.apache.cxf.common.i18n.Messag
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.common.util.URIParserUtil;
-import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.helpers.FileUtils;
 import org.apache.cxf.helpers.XMLUtils;
 import org.apache.cxf.resource.URIResolver;
@@ -109,7 +108,7 @@ public final class CustomizationParser {
         Element root = null;
         try {
             URIResolver resolver = new URIResolver(bindingFile);
-            root = 
DOMUtils.readXml(resolver.getInputStream()).getDocumentElement();
+            root = 
StaxUtils.read(resolver.getInputStream()).getDocumentElement();
         } catch (Exception e1) {
             Message msg = new Message("CAN_NOT_READ_AS_ELEMENT", LOG, new 
Object[] {bindingFile});
             throw new ToolException(msg, e1);