Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix encoding issues in parser 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345168 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-11-17 02:19:16 +00:00
parent ad2dd60452
commit 3c5f84b6b6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bootstrap/bootstrap-mini/src/main/java/org/apache/maven/bootstrap/util/AbstractReader.java
View File

@ -24,11 +24,11 @@ import org.xml.sax.helpers.DefaultHandler;
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 @@ public abstract class AbstractReader
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 @@ public abstract class AbstractReader
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() );
}
}