svn commit: r1094046 - in /webservices/commons/trunk/modules/neethi: pom.xml src/main/java/org/apache/neethi/builders/converters/DOMToOMConverter.java

[veithen]

Author: veithen
Date: Sat Apr 16 20:28:34 2011
New Revision: 1094046

URL: http://svn.apache.org/viewvc?rev=1094046&view=rev
Log:
Make use of the new API introduced by Axiom r1094037.

Modified:
    webservices/commons/trunk/modules/neethi/pom.xml
    
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/converters/DOMToOMConverter.java

Modified: webservices/commons/trunk/modules/neethi/pom.xml
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/pom.xml?rev=1094046&r1=1094045&r2=1094046&view=diff
==============================================================================
--- webservices/commons/trunk/modules/neethi/pom.xml (original)
+++ webservices/commons/trunk/modules/neethi/pom.xml Sat Apr 16 20:28:34 2011
@@ -310,7 +310,7 @@
         </site>
     </distributionManagement>
     <properties>
-        <axiom.version>1.2.11</axiom.version>
+        <axiom.version>1.2.12-SNAPSHOT</axiom.version>
         <neethi.osgi.version>${project.version}</neethi.osgi.version>
         <bundle.plugin.version>2.1.0</bundle.plugin.version>
         <failIfNoTests>false</failIfNoTests>

Modified: 
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/converters/DOMToOMConverter.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/converters/DOMToOMConverter.java?rev=1094046&r1=1094045&r2=1094046&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/converters/DOMToOMConverter.java
 (original)
+++ 
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/converters/DOMToOMConverter.java
 Sat Apr 16 20:28:34 2011
@@ -19,14 +19,10 @@
 
 package org.apache.neethi.builders.converters;
 
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.dom.DOMSource;
 
 import org.w3c.dom.Element;
 
-import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMXMLBuilderFactory;
 
@@ -37,17 +33,6 @@ public class DOMToOMConverter extends Ab
     implements Converter<Element, OMElement> {
 
     public OMElement convert(Element s) {
-        try {
-            return OMXMLBuilderFactory
-                .createStAXOMBuilder(OMAbstractFactory.getOMFactory(),
-                                     
XMLInputFactory.newInstance().createXMLStreamReader(new DOMSource(s)))
-                                     .getDocumentElement();
-        } catch (XMLStreamException e) {
-            //ignore - will deal with it in the builder
-        } catch (FactoryConfigurationError e) {
-            //ignore - will deal with it in the builder
-        }
-        return null;
-
+        return OMXMLBuilderFactory.createOMBuilder(new 
DOMSource(s)).getDocumentElement();
     }
 }