svn commit: r649799 - in /maven/plugins/trunk/maven-ant-plugin/src: main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java test/java/org/apache/maven/plugin/ant/AntWrapper.java

[be...@apache.org]

Author: bentmann
Date: Sat Apr 19 04:49:07 2008
New Revision: 649799

URL: http://svn.apache.org/viewvc?rev=649799&view=rev
Log:
o Avoided usage of StringInputStream/StringOutputStream with regard to PLXUTILS-70

Modified:
    maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
    maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntWrapper.java

Modified: maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java?rev=649799&r1=649798&r2=649799&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java Sat Apr 19 04:49:07 2008
@@ -19,6 +19,7 @@
  * under the License.
  */
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.text.DateFormat;
@@ -39,7 +40,6 @@
 import org.apache.maven.wagon.PathUtils;
 import org.apache.xpath.XPathAPI;
 import org.apache.xpath.objects.XObject;
-import org.codehaus.plexus.util.StringInputStream;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.XMLWriter;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -1129,7 +1129,7 @@
             try
             {
                 Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder()
-                    .parse( new StringInputStream( pluginConf.toString() ) );
+                    .parse( new ByteArrayInputStream( pluginConf.toString().getBytes( "UTF-8" ) ) );
 
                 XObject obj = XPathAPI.eval( doc, "//configuration/" + optionName );
 

Modified: maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntWrapper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntWrapper.java?rev=649799&r1=649798&r2=649799&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntWrapper.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntWrapper.java Sat Apr 19 04:49:07 2008
@@ -19,6 +19,7 @@
  * under the License.
  */
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.OutputStream;
 import java.io.PrintStream;
@@ -28,7 +29,6 @@
 import org.apache.tools.ant.ExitException;
 import org.apache.tools.ant.Main;
 import org.apache.tools.ant.util.optional.NoExitSecurityManager;
-import org.codehaus.plexus.util.StringOutputStream;
 import org.codehaus.plexus.util.StringUtils;
 
 /**
@@ -73,12 +73,12 @@
         System.setSecurityManager( new NoExitSecurityManager() );
 
         PrintStream oldErr = System.err;
-        OutputStream errOS = new StringOutputStream();
+        OutputStream errOS = new ByteArrayOutputStream();
         PrintStream err = new PrintStream( errOS );
         System.setErr( err );
 
         PrintStream oldOut = System.out;
-        OutputStream outOS = new StringOutputStream();
+        OutputStream outOS = new ByteArrayOutputStream();
         PrintStream out = new PrintStream( outOS );
         System.setOut( out );