WSCOMMONS-452: Moved some code that was intended for inclusion into A…

…xiom.
apache · Apr 25, 2010 · 9c977ea · 9c977ea
1 parent a386b4c
commit 9c977ea
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 317 deletions.
diff --git a/modules/base/src/main/java/org/apache/axis2/format/ElementHelper.java b/modules/base/src/main/java/org/apache/axis2/format/ElementHelper.java
diff --git a/modules/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java b/modules/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java
@@ -24,6 +24,7 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axiom.om.OMOutputFormat;
 import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.util.ElementHelper;
 import org.apache.axis2.transport.base.BaseConstants;
 
 import java.io.ByteArrayOutputStream;

diff --git a/modules/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java b/modules/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java
@@ -25,6 +25,7 @@
 import javax.activation.DataSource;
 
 import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.util.ElementHelper;
 import org.apache.axis2.transport.base.streams.ReaderInputStream;
 
 /**

diff --git a/modules/base/src/main/java/org/apache/axis2/format/TextFromElementReader.java b/modules/base/src/main/java/org/apache/axis2/format/TextFromElementReader.java
diff --git a/modules/base/src/test/java/org/apache/axis2/format/ElementHelperTest.java b/modules/base/src/test/java/org/apache/axis2/format/ElementHelperTest.java
@@ -45,6 +45,8 @@
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
 import org.apache.axiom.om.impl.llom.util.AXIOMUtil;
+import org.apache.axiom.om.util.ElementHelper;
+import org.apache.axiom.util.stax.TextFromElementReader;
 import org.apache.commons.io.IOUtils;
 
 public class ElementHelperTest extends TestCase {

diff --git a/modules/base/src/test/java/org/apache/axis2/format/TextFromElementReaderTest.java b/modules/base/src/test/java/org/apache/axis2/format/TextFromElementReaderTest.java
diff --git a/pom.xml b/pom.xml
@@ -495,7 +495,7 @@
     </reporting>
 
     <properties>
-        <axiom.version>1.2.8</axiom.version>
+        <axiom.version>1.2.9-SNAPSHOT</axiom.version>
         <axis2.version>1.5</axis2.version>
         <failIfNoTests>false</failIfNoTests>
     </properties>