svn commit: r585259 - in /maven/components/branches/maven-2.0.x: ./ maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/

[hboutemy]

Author: hboutemy
Date: Tue Oct 16 13:40:07 2007
New Revision: 585259

URL: http://svn.apache.org/viewvc?rev=585259&view=rev
Log:
[MNG-2254] support XML file encoding when reading/writing repository metadata

Modified:
    
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
    
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
    maven/components/branches/maven-2.0.x/pom.xml

Modified: 
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java?rev=585259&r1=585258&r2=585259&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
 Tue Oct 16 13:40:07 2007
@@ -25,11 +25,11 @@
 import 
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
 import 
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Writer;
 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.Writer;
@@ -93,7 +93,7 @@
 
             try
             {
-                reader = new FileReader( metadataFile );
+                reader = ReaderFactory.newXmlReader( metadataFile );
 
                 metadata = mappingReader.read( reader, false );
             }
@@ -131,7 +131,7 @@
             try
             {
                 metadataFile.getParentFile().mkdirs();
-                writer = new FileWriter( metadataFile );
+                writer = WriterFactory.newXmlWriter( metadataFile );
 
                 MetadataXpp3Writer mappingWriter = new MetadataXpp3Writer();
 

Modified: 
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java?rev=585259&r1=585258&r2=585259&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
 Tue Oct 16 13:40:07 2007
@@ -28,11 +28,11 @@
 import org.apache.maven.wagon.TransferFailedException;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.Reader;
 import java.util.Date;
@@ -269,14 +269,14 @@
     {
         Metadata result;
 
-        Reader fileReader = null;
+        Reader reader = null;
         try
         {
-            fileReader = new FileReader( mappingFile );
+            reader = ReaderFactory.newXmlReader( mappingFile );
 
             MetadataXpp3Reader mappingReader = new MetadataXpp3Reader();
 
-            result = mappingReader.read( fileReader, false );
+            result = mappingReader.read( reader, false );
         }
         catch ( FileNotFoundException e )
         {
@@ -294,7 +294,7 @@
         }
         finally
         {
-            IOUtil.close( fileReader );
+            IOUtil.close( reader );
         }
         return result;
     }

Modified: maven/components/branches/maven-2.0.x/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=585259&r1=585258&r2=585259&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/pom.xml Tue Oct 16 13:40:07 2007
@@ -86,7 +86,6 @@
               </goals>
             </execution>
             <execution>
-
               <id>standard</id>
               <goals>
                 <goal>java</goal>
@@ -95,7 +94,7 @@
               </goals>
             </execution>
           </executions>
-        </plugin>        
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
@@ -206,7 +205,7 @@
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-monitor</artifactId>
         <version>${mavenVersion}</version>
-      </dependency>      
+      </dependency>
       <!-- Plexus -->
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
@@ -216,7 +215,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.wagon</groupId>