Return-Path: Delivered-To: apmail-maven-archiva-commits-archive@locus.apache.org Received: (qmail 69373 invoked from network); 24 Feb 2008 05:07:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Feb 2008 05:07:48 -0000 Received: (qmail 63038 invoked by uid 500); 24 Feb 2008 05:07:43 -0000 Delivered-To: apmail-maven-archiva-commits-archive@maven.apache.org Received: (qmail 62998 invoked by uid 500); 24 Feb 2008 05:07:43 -0000 Mailing-List: contact archiva-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: archiva-dev@maven.apache.org Delivered-To: mailing list archiva-commits@maven.apache.org Received: (qmail 62987 invoked by uid 99); 24 Feb 2008 05:07:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Feb 2008 21:07:43 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Feb 2008 05:07:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B47771A9832; Sat, 23 Feb 2008 21:07:27 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r630589 - in /maven/archiva/trunk/archiva-base/archiva-artifact-converter: ./ src/main/java/org/apache/maven/archiva/converter/artifact/ Date: Sun, 24 Feb 2008 05:07:27 -0000 To: archiva-commits@maven.apache.org From: joakime@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080224050727.B47771A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ Converts between Legacy and Modern Layout Artifacts. + commons-io + commons-io + + org.apache.maven maven-repository-metadata 2.0.4 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 ); } } }