Author: bentmann
Date: Tue Feb 24 19:23:39 2009
New Revision: 747515
URL: http://svn.apache.org/viewvc?rev=747515&view=rev
Log:
o Fixed encoding handling
Modified:
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/artifact/VersionExpressionTransformation.java
Modified:
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/artifact/VersionExpressionTransformation.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/artifact/VersionExpressionTransformation.java?rev=747515&r1=747514&r2=747515&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/artifact/VersionExpressionTransformation.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/artifact/VersionExpressionTransformation.java
Tue Feb 24 19:23:39 2009
@@ -41,15 +41,13 @@
import org.codehaus.plexus.interpolation.ValueSource;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
import java.io.Writer;
import java.util.ArrayList;
import java.util.Iterator;
@@ -215,7 +213,7 @@
Model model;
try
{
- reader = new FileReader( pomFile );
+ reader = ReaderFactory.newXmlReader( pomFile );
model = new MavenXpp3Reader().read( reader );
}
finally
@@ -276,14 +274,11 @@
String pomContents;
try
{
- FileReader reader = null;
+ Reader reader = null;
try
{
- reader = new FileReader( pomFile );
- StringWriter writer = new StringWriter();
- IOUtil.copy( reader, writer );
-
- pomContents = writer.toString();
+ reader = ReaderFactory.newXmlReader( pomFile );
+ pomContents = IOUtil.toString( reader );
}
catch ( IOException e )
{
@@ -368,9 +363,9 @@
{
outputFile.getParentFile().mkdirs();
- writer = new FileWriter( outputFile );
+ writer = WriterFactory.newXmlWriter( outputFile );
- IOUtil.copy( new StringReader( pomContents ), writer );
+ IOUtil.copy( pomContents, writer );
}
catch ( IOException e )
{
