svn commit: r1088571 - in /axis/axis2/java/rampart/trunk/modules: rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java

[veithen]

Author: veithen
Date: Mon Apr  4 11:57:24 2011
New Revision: 1088571

URL: http://svn.apache.org/viewvc?rev=1088571&view=rev
Log:
Make use of the API defined by AXIOM-353.

Modified:
    
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
    
axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java?rev=1088571&r1=1088570&r2=1088571&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
 Mon Apr  4 11:57:24 2011
@@ -21,6 +21,7 @@ import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
 import org.apache.axiom.soap.SOAP11Constants;
@@ -29,6 +30,7 @@ import org.apache.axiom.soap.SOAPEnvelop
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPHeader;
 import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.axiom.soap.SOAPModelBuilder;
 import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
 import org.apache.axiom.soap.impl.dom.SOAPHeaderBlockImpl;
 import org.apache.axiom.soap.impl.dom.factory.DOMSOAPFactory;
@@ -41,7 +43,6 @@ import org.w3c.dom.Element;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
 
 import java.io.ByteArrayInputStream;
@@ -230,8 +231,8 @@ public class Axis2Util {
                 }
                 XMLStreamReader reader = ((OMElement) doc.getDocumentElement())
                         .getXMLStreamReader();
-                StAXSOAPModelBuilder stAXSOAPModelBuilder = new 
StAXSOAPModelBuilder(
-                        reader, null);
+                SOAPModelBuilder stAXSOAPModelBuilder = 
OMXMLBuilderFactory.createStAXSOAPModelBuilder(
+                        reader);
                 SOAPEnvelope envelope = stAXSOAPModelBuilder.getSOAPEnvelope();
                 
                 //Set the processed flag of the processed headers
@@ -258,7 +259,7 @@ public class Axis2Util {
                 XMLUtils.outputDOM(doc.getDocumentElement(), os, true);
                 ByteArrayInputStream bais =  new 
ByteArrayInputStream(os.toByteArray());
 
-                StAXSOAPModelBuilder stAXSOAPModelBuilder = new 
StAXSOAPModelBuilder(XMLInputFactory.newInstance().createXMLStreamReader(bais), 
null);
+                SOAPModelBuilder stAXSOAPModelBuilder = 
OMXMLBuilderFactory.createSOAPModelBuilder(bais, null);
                 return stAXSOAPModelBuilder.getSOAPEnvelope();
             } catch (Exception e) {
                 throw new WSSecurityException(e.getMessage());

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java?rev=1088571&r1=1088570&r2=1088571&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java
 Mon Apr  4 11:57:24 2011
@@ -17,13 +17,15 @@
 package org.apache.rampart.policy.model;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
 import org.apache.neethi.Assertion;
 import org.apache.neethi.Policy;
 import org.apache.neethi.PolicyEngine;
 
 import javax.xml.namespace.QName;
 
+import java.io.FileInputStream;
 import java.util.Properties;
 
 import junit.framework.TestCase;
@@ -35,7 +37,7 @@ public class RampartPolicyTest extends T
     
     public void testLoadPolicy() throws Exception {
         String xmlPath = "test-resources/policy/rampart-policy-1.xml";
-        StAXOMBuilder builder = new StAXOMBuilder(xmlPath);
+        OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(new 
FileInputStream(xmlPath));
         
         OMElement elem = builder.getDocumentElement();