svn commit: r937857 - in /axis/axis2/java/transports/trunk: ./ modules/base/src/main/java/org/apache/axis2/format/ modules/base/src/test/java/org/apache/axis2/format/

[veithen]

Author: veithen
Date: Sun Apr 25 19:07:04 2010
New Revision: 937857

URL: http://svn.apache.org/viewvc?rev=937857&view=rev
Log:
WSCOMMONS-452: Moved some code that was intended for inclusion into Axiom.

Removed:
    
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/ElementHelper.java
    
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextFromElementReader.java
    
axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/TextFromElementReaderTest.java
Modified:
    
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java
    
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java
    
axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/ElementHelperTest.java
    axis/axis2/java/transports/trunk/pom.xml

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java?rev=937857&r1=937856&r2=937857&view=diff
==============================================================================
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java
 Sun Apr 25 19:07:04 2010
@@ -24,6 +24,7 @@ import org.apache.axis2.context.MessageC
 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;

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java?rev=937857&r1=937856&r2=937857&view=diff
==============================================================================
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java
 Sun Apr 25 19:07:04 2010
@@ -25,6 +25,7 @@ import java.io.OutputStream;
 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;
 
 /**

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/ElementHelperTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/ElementHelperTest.java?rev=937857&r1=937856&r2=937857&view=diff
==============================================================================
--- 
axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/ElementHelperTest.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/ElementHelperTest.java
 Sun Apr 25 19:07:04 2010
@@ -45,6 +45,8 @@ import org.apache.axiom.om.OMSourcedElem
 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 {

Modified: axis/axis2/java/transports/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/pom.xml?rev=937857&r1=937856&r2=937857&view=diff
==============================================================================
--- axis/axis2/java/transports/trunk/pom.xml (original)
+++ axis/axis2/java/transports/trunk/pom.xml Sun Apr 25 19:07:04 2010
@@ -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>