svn commit: r1240337 - in /axis/axis2/java/rampart/trunk/modules: rampart-core/pom.xml rampart-trust/src/main/java/org/apache/rahas/RahasData.java

[veithen]

Author: veithen
Date: Fri Feb  3 21:06:09 2012
New Revision: 1240337

URL: http://svn.apache.org/viewvc?rev=1240337&view=rev
Log:
Eliminated some direct (compile time) dependencies on DOOM.

Modified:
    axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml
    
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java

Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml?rev=1240337&r1=1240336&r2=1240337&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml Fri Feb  3 
21:06:09 2012
@@ -70,6 +70,7 @@
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-dom</artifactId>
+            <scope>runtime</scope>
         </dependency>
     </dependencies>
 

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java?rev=1240337&r1=1240336&r2=1240337&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
 Fri Feb  3 21:06:09 2012
@@ -16,9 +16,9 @@
 
 package org.apache.rahas;
 
+import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.impl.dom.factory.OMDOMFactory;
+import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.om.util.Base64;
 import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.context.MessageContext;
@@ -324,8 +324,9 @@ public class RahasData {
             OMElement strElem = validateTargetElem.getFirstChildWithName(new 
QName(WSConstants.WSSE_NS,
                                                    "SecurityTokenReference"));
             
-            Element elem = (Element)(new StAXOMBuilder(new OMDOMFactory(), 
-                    strElem.getXMLStreamReader()).getDocumentElement());
+            Element elem = (Element)OMXMLBuilderFactory.createStAXOMBuilder(
+                    
OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM).getOMFactory(),
+                    strElem.getXMLStreamReader()).getDocumentElement();
             
             try {
                 SecurityTokenReference str = new 
SecurityTokenReference((Element)elem);
@@ -350,8 +351,9 @@ public class RahasData {
             OMElement strElem = renewTargetElem.getFirstChildWithName(new 
QName(WSConstants.WSSE_NS,
                                                    "SecurityTokenReference"));
             
-            Element elem = (Element)(new StAXOMBuilder(new OMDOMFactory(), 
-                    strElem.getXMLStreamReader()).getDocumentElement());
+            Element elem = (Element)OMXMLBuilderFactory.createStAXOMBuilder(
+                    
OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM).getOMFactory(),
+                    strElem.getXMLStreamReader()).getDocumentElement();
             
             try {
                 SecurityTokenReference str = new 
SecurityTokenReference((Element)elem);