Author: veithen
Date: Sun Oct 16 16:13:37 2011
New Revision: 1184857
URL: http://svn.apache.org/viewvc?rev=1184857&view=rev
Log:
AXIS2-4902: Eliminated a couple of direct references to the Axiom DOOM
implementation.
Modified:
axis/axis2/java/core/trunk/modules/adb/pom.xml
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Modified: axis/axis2/java/core/trunk/modules/adb/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/pom.xml?rev=1184857&r1=1184856&r2=1184857&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/adb/pom.xml Sun Oct 16 16:13:37 2011
@@ -46,6 +46,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-dom</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1184857&r1=1184856&r2=1184857&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Sun Oct 16 16:13:37 2011
@@ -56,8 +56,6 @@ import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.om.*;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
-import org.apache.axiom.om.impl.dom.DocumentImpl;
import org.apache.axiom.om.util.Base64;
import org.apache.axis2.AxisFault;
import org.apache.axis2.classloader.BeanInfoCache;
@@ -1327,9 +1325,10 @@ public class BeanUtil {
* @return the DOOM document
*/
public static OMDocument convertOMtoDOM(OMContainer omElement) {
- // use AXIOM DOOMAbstractFactory to get org.w3c.dom.Document
- OMFactory doomFactory = DOOMAbstractFactory.getOMFactory();
- StAXOMBuilder doomBuilder = new StAXOMBuilder(doomFactory,
+ // use an Axiom meta factory with feature "dom" to get
org.w3c.dom.Document
+ OMFactory doomFactory = OMAbstractFactory.getMetaFactory(
+ OMAbstractFactory.FEATURE_DOM).getOMFactory();
+ OMXMLParserWrapper doomBuilder =
OMXMLBuilderFactory.createStAXOMBuilder(doomFactory,
omElement.getXMLStreamReader());
OMDocument domElement = doomBuilder.getDocument();
return domElement;
@@ -1344,7 +1343,7 @@ public class BeanUtil {
*/
public static OMElement convertDOMtoOM(OMFactory fac, Object document) {
-
if(DocumentImpl.class.getName().equals(document.getClass().getName())) {
+ if (document instanceof OMDocument) {
return ((OMDocument)document).getOMDocumentElement();
} else {
