svn commit: r345168 - /maven/components/trunk/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/util/AbstractReader.java

[brett]

Author: brett
Date: Wed Nov 16 18:19:16 2005
New Revision: 345168

URL: http://svn.apache.org/viewcvs?rev=345168&view=rev
Log:
fix encoding issues in parser

Modified:
    
maven/components/trunk/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/util/AbstractReader.java

Modified: 
maven/components/trunk/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/util/AbstractReader.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/util/AbstractReader.java?rev=345168&r1=345167&r2=345168&view=diff
==============================================================================
--- 
maven/components/trunk/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/util/AbstractReader.java
 (original)
+++ 
maven/components/trunk/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/util/AbstractReader.java
 Wed Nov 16 18:19:16 2005
@@ -24,11 +24,11 @@
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
 
 /**
  * Parse an XML file.
@@ -52,12 +52,12 @@
         SAXParser parser = saxFactory.newSAXParser();
 
         // Cheap and cheerful. Please add more to skip if the parser chokes 
(or use the actual
-        StringWriter output = new StringWriter();
-        IOUtil.copy( new FileReader( file ), output);
-        String out = output.toString();
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        IOUtil.copy( new FileInputStream( file ), output );
+        String out = output.toString( "UTF-8" );
         out = StringUtils.replace( out, "ø", "\u00f8" );
 
-        InputSource is = new InputSource( new StringReader( out ) );
+        InputSource is = new InputSource( new ByteArrayInputStream( 
out.getBytes( "UTF-8" ) ) );
 
         try
         {
@@ -87,7 +87,7 @@
 
     private final void printParseError( String type, SAXParseException spe )
     {
-        System.err.println( type + " [line " + spe.getLineNumber() + ", row " 
+ spe.getColumnNumber() + "]: " +
-                            spe.getMessage() );
+        System.err.println(
+            type + " [line " + spe.getLineNumber() + ", row " + 
spe.getColumnNumber() + "]: " + spe.getMessage() );
     }
 }