svn commit: r656348 - in /maven/plugin-testing/trunk/maven-plugin-testing-tools: pom.xml src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java

[bentmann]

Author: bentmann
Date: Wed May 14 11:24:09 2008
New Revision: 656348

URL: http://svn.apache.org/viewvc?rev=656348&view=rev
Log:
[MPLUGINTESTING-5] Respect file encoding of POMs

Modified:
    maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml
    
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
    
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java

Modified: maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml?rev=656348&r1=656347&r2=656348&view=diff
==============================================================================
--- maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml (original)
+++ maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml Wed May 14 
11:24:09 2008
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.4.2</version>
+      <version>1.5.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>

Modified: 
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java?rev=656348&r1=656347&r2=656348&view=diff
==============================================================================
--- 
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
 (original)
+++ 
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
 Wed May 14 11:24:09 2008
@@ -19,9 +19,9 @@
 package org.apache.maven.shared.test.plugin;
 
 import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -49,6 +49,8 @@
 import org.apache.maven.project.artifact.ProjectArtifactMetadata;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.WriterFactory;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
@@ -260,8 +262,8 @@
         File output = new File( pomFile.getParentFile(), "pom-" + testVersion 
+ ".xml" );
         output.deleteOnExit();
 
-        FileReader reader = null;
-        FileWriter writer = null;
+        Reader reader = null;
+        Writer writer = null;
 
         Model model = null;
         String finalName = null;
@@ -269,7 +271,7 @@
         
         try
         {
-            reader = new FileReader( input );
+            reader = ReaderFactory.newXmlReader( input );
             
             model = new MavenXpp3Reader().read( reader );
         }
@@ -388,7 +390,7 @@
                 configDom.addChild( skipDom );
             }
 
-            writer = new FileWriter( output );
+            writer = WriterFactory.newXmlWriter( output );
 
             new MavenXpp3Writer().write( writer, model );
         }

Modified: 
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java?rev=656348&r1=656347&r2=656348&view=diff
==============================================================================
--- 
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java
 (original)
+++ 
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java
 Wed May 14 11:24:09 2008
@@ -19,8 +19,8 @@
 package org.apache.maven.shared.test.plugin;
 
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
+import java.io.Reader;
 import java.net.MalformedURLException;
 
 import org.apache.maven.artifact.Artifact;
@@ -44,6 +44,7 @@
 import org.codehaus.plexus.context.ContextException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
 import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 /**
@@ -237,13 +238,13 @@
             String pomArtifactId = null;
             String pomVersion = null;
 
-            FileReader reader = null;
+            Reader reader = null;
 
             File currentPom = pom;
 
             try
             {
-                reader = new FileReader( pom );
+                reader = ReaderFactory.newXmlReader( pom );
 
                 Model model = pomReader.read( reader );