You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2012/04/30 14:14:31 UTC

svn commit: r1332171 - in /webservices/commons/trunk/modules/axiom/modules: axiom-api/src/main/java/org/apache/axiom/om/util/ axiom-compat/ axiom-compat/src/main/java/org/apache/axiom/om/util/ axiom-compat/src/test/ axiom-compat/src/test/java/ axiom-co...

Author: veithen
Date: Mon Apr 30 12:14:30 2012
New Revision: 1332171

URL: http://svn.apache.org/viewvc?rev=1332171&view=rev
Log:
AXIOM-418: Moved TextHelper to axiom-compat.

Added:
    webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/main/java/org/apache/axiom/om/util/TextHelper.java
      - copied, changed from r1331100, webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/TextHelper.java
    webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/test/
    webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/test/java/
    webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/test/java/org/
    webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/test/java/org/apache/
    webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/test/java/org/apache/axiom/
    webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/test/java/org/apache/axiom/om/
    webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/test/java/org/apache/axiom/om/util/
    webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/test/java/org/apache/axiom/om/util/TextHelperTest.java
      - copied unchanged from r1332170, webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/util/TextHelperTest.java
Removed:
    webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/TextHelper.java
    webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/util/TextHelperTest.java
Modified:
    webservices/commons/trunk/modules/axiom/modules/axiom-compat/pom.xml

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-compat/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-compat/pom.xml?rev=1332171&r1=1332170&r2=1332171&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-compat/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-compat/pom.xml Mon Apr 30 12:14:30 2012
@@ -43,5 +43,16 @@
             <artifactId>axiom-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axiom-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

Copied: webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/main/java/org/apache/axiom/om/util/TextHelper.java (from r1331100, webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/TextHelper.java)
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/main/java/org/apache/axiom/om/util/TextHelper.java?p2=webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/main/java/org/apache/axiom/om/util/TextHelper.java&p1=webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/TextHelper.java&r1=1331100&r2=1332171&rev=1332171&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/TextHelper.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-compat/src/main/java/org/apache/axiom/om/util/TextHelper.java Mon Apr 30 12:14:30 2012
@@ -33,6 +33,7 @@ import org.apache.axiom.attachments.life
 import org.apache.axiom.attachments.lifecycle.impl.LifecycleManagerImpl;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMText;
+import org.apache.axiom.util.base64.Base64EncodingStringBufferOutputStream;
 import org.apache.axiom.util.base64.Base64Utils;
 
 public class TextHelper {
@@ -52,9 +53,8 @@ public class TextHelper {
     private static int DELETE_TIME = 60 * 60; // 1 Hour
     
     /**
-     * @param inStream InputStream
-     * @return Base64 encoded string representint the data in inStream
-     * @throws IOException
+     * @deprecated This method was internally used by Axiom before version 1.2.9 but is no longer
+     *             required.
      */
     public static String toString(InputStream inStream) throws IOException {
         StringBuffer buffer = new StringBuffer();
@@ -63,10 +63,8 @@ public class TextHelper {
     }
     
     /**
-     * Append Base64 encoding of the data in the inStream to the specified buffer
-     * @param inStream InputStream
-     * @param buffer Buffer
-     * @throws IOException
+     * @deprecated This method was internally used by Axiom before version 1.2.9 but is no longer
+     *             required.
      */
     public static void toStringBuffer(InputStream inStream, StringBuffer buffer) throws IOException {
         int avail = inStream.available();
@@ -100,10 +98,10 @@ public class TextHelper {
     }
     
     /**
-     * Append data in the omText to the specified buffer
-     * @param omText the text node to get the character data from
-     * @param buffer Buffer
-     * @throws IOException
+     * @deprecated If you really need to write the base64 encoded content of an {@link OMText}
+     *             instance to a {@link StringBuffer}, then request the {@link DataHandler} using
+     *             {@link OMText#getDataHandler()} and use
+     *             {@link Base64EncodingStringBufferOutputStream} to encode it.
      */
     public static void toStringBuffer(OMText omText, StringBuffer buffer) throws IOException {
         // If an InputStream is present, stream the BASE64 text to the StreamBuffer