svn commit: r586605 - in /maven/ant-tasks/branches/maven-ant-tasks-2.0.x: pom.xml src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java src/main/java/org/apache/maven/artifact/ant/Pom.java

[hb...@apache.org]

Author: hboutemy
Date: Fri Oct 19 13:47:51 2007
New Revision: 586605

URL: http://svn.apache.org/viewvc?rev=586605&view=rev
Log:
[MANTTASKS-79] add XML encoding support for pom.xml and settings.xml

Modified:
    maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml
    maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
    maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/Pom.java

Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml?rev=586605&r1=586604&r2=586605&view=diff
==============================================================================
--- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml (original)
+++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml Fri Oct 19 13:47:51 2007
@@ -139,7 +139,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.4.1</version>
+      <version>1.4.5</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>

Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?rev=586605&r1=586604&r2=586605&view=diff
==============================================================================
--- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java (original)
+++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java Fri Oct 19 13:47:51 2007
@@ -48,12 +48,13 @@
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.embed.Embedder;
 import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
+import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -237,11 +238,11 @@
 
     private void loadSettings( File settingsFile )
     {
-        FileReader reader = null;
+        Reader reader = null;
         try
         {
             log( "Loading Maven settings file: " + settingsFile.getPath(), Project.MSG_VERBOSE );
-            reader = new FileReader( settingsFile );
+            reader = ReaderFactory.newXmlReader( settingsFile );
 
             SettingsXpp3Reader modelReader = new SettingsXpp3Reader();
 

Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/Pom.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/Pom.java?rev=586605&r1=586604&r2=586605&view=diff
==============================================================================
--- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/Pom.java (original)
+++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/Pom.java Fri Oct 19 13:47:51 2007
@@ -45,14 +45,13 @@
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.PropertyHelper;
+import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.introspection.ReflectionValueExtractor;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.Reader;
 import java.util.Collections;
 import java.util.List;
@@ -187,8 +186,7 @@
         Model model = null;
         try
         {
-            InputStream in = new FileInputStream( file );
-            Reader reader = new InputStreamReader( in, "UTF-8" );
+            Reader reader = ReaderFactory.newXmlReader( file );
             model = new MavenXpp3Reader().read( reader );
         }
         catch ( IOException e )