svn commit: r630589 - in /maven/archiva/trunk/archiva-base/archiva-artifact-converter: ./ src/main/java/org/apache/maven/archiva/converter/artifact/

[joakime]

Author: joakime
Date: Sat Feb 23 21:07:26 2008
New Revision: 630589

URL: http://svn.apache.org/viewvc?rev=630589&view=rev
Log:
MRM-709: Use commons-io instead of Plexus Utils 
* Using FileUtils from commons-io.

Modified:
    maven/archiva/trunk/archiva-base/archiva-artifact-converter/pom.xml
    
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/AsciiFileUtil.java
    
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java

Modified: maven/archiva/trunk/archiva-base/archiva-artifact-converter/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-artifact-converter/pom.xml?rev=630589&r1=630588&r2=630589&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-artifact-converter/pom.xml 
(original)
+++ maven/archiva/trunk/archiva-base/archiva-artifact-converter/pom.xml Sat Feb 
23 21:07:26 2008
@@ -29,6 +29,10 @@
   <description>Converts between Legacy and Modern Layout 
Artifacts.</description>
   <dependencies>
     <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-repository-metadata</artifactId>
       <version>2.0.4</version>

Modified: 
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/AsciiFileUtil.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/AsciiFileUtil.java?rev=630589&r1=630588&r2=630589&view=diff
==============================================================================
--- 
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/AsciiFileUtil.java
 (original)
+++ 
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/AsciiFileUtil.java
 Sat Feb 23 21:07:26 2008
@@ -19,13 +19,11 @@
  * under the License.
  */
 
-import org.codehaus.plexus.util.IOUtil;
-
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 
+import org.apache.commons.io.FileUtils;
+
 /**
  * AsciiFileUtil - conveinence utility for reading / writing ascii files.
  * 
@@ -45,16 +43,7 @@
     public static String readFile( File file )
         throws IOException
     {
-        FileInputStream in = null;
-        try
-        {
-            in = new FileInputStream( file );
-            return IOUtil.toString( in );
-        }
-        finally
-        {
-            IOUtil.close( in );
-        }
+        return FileUtils.readFileToString( file, null );
     }
 
     /**
@@ -67,15 +56,6 @@
     public static void writeFile( File file, String content )
         throws IOException
     {
-        FileOutputStream out = null;
-        try
-        {
-            out = new FileOutputStream( file );
-            IOUtil.copy( content, out );
-        }
-        finally
-        {
-            IOUtil.close( out );
-        }
+        FileUtils.writeStringToFile( file, content, null );
     }
 }

Modified: 
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java?rev=630589&r1=630588&r2=630589&view=diff
==============================================================================
--- 
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
 (original)
+++ 
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
 Sat Feb 23 21:07:26 2008
@@ -19,6 +19,8 @@
  * under the License.
  */
 
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.maven.archiva.transaction.FileTransaction;
 import org.apache.maven.archiva.transaction.TransactionException;
 import org.apache.maven.artifact.Artifact;
@@ -41,8 +43,6 @@
 import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
 import org.codehaus.plexus.digest.Digester;
 import org.codehaus.plexus.digest.DigesterException;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 import java.io.File;
@@ -275,7 +275,7 @@
                 }
                 finally
                 {
-                    IOUtil.close( writer );
+                    IOUtils.closeQuietly( writer );
                 }
             }
         }
@@ -411,7 +411,7 @@
         }
         finally
         {
-            IOUtil.close( fileReader );
+            IOUtils.closeQuietly( fileReader );
         }
         return metadata;
     }
@@ -583,7 +583,7 @@
             }
             finally
             {
-                IOUtil.close( writer );
+                IOUtils.closeQuietly( writer );
             }
         }
     }