Return-Path: Delivered-To: apmail-maven-archiva-commits-archive@locus.apache.org Received: (qmail 69817 invoked from network); 24 Feb 2008 05:12:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Feb 2008 05:12:46 -0000 Received: (qmail 64651 invoked by uid 500); 24 Feb 2008 05:12:41 -0000 Delivered-To: apmail-maven-archiva-commits-archive@maven.apache.org Received: (qmail 64608 invoked by uid 500); 24 Feb 2008 05:12:41 -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 64597 invoked by uid 99); 24 Feb 2008 05:12:41 -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:12:41 -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:12:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B65C21A9832; Sat, 23 Feb 2008 21:12:23 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r630590 - in /maven/archiva/trunk/archiva-base/archiva-artifact-converter/src: main/java/org/apache/maven/archiva/converter/artifact/ test/java/org/apache/maven/archiva/converter/artifact/ Date: Sun, 24 Feb 2008 05:12:23 -0000 To: archiva-commits@maven.apache.org From: joakime@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080224051223.B65C21A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: joakime Date: Sat Feb 23 21:12:20 2008 New Revision: 630590 URL: http://svn.apache.org/viewvc?rev=630590&view=rev Log: MRM-709: Use commons-io instead of Plexus Utils * Eliminating AsciiFileUtil as it is now redundant. Removed: maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/AsciiFileUtil.java Modified: maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java 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=630590&r1=630589&r2=630590&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:12:20 2008 @@ -193,7 +193,7 @@ } // Even if the checksums for the POM are invalid we should still convert the POM - contents = AsciiFileUtil.readFile( file ); + contents = FileUtils.readFileToString( file, null ); } catch ( IOException e ) { @@ -209,7 +209,7 @@ boolean matching = false; if ( !force && targetFile.exists() ) { - String targetContents = AsciiFileUtil.readFile( targetFile ); + String targetContents = FileUtils.readFileToString( targetFile, null ); matching = targetContents.equals( contents ); } if ( force || !matching ) @@ -308,7 +308,7 @@ File checksumFile = new File( file.getParentFile(), fileName ); if ( checksumFile.exists() ) { - String checksum = AsciiFileUtil.readFile( checksumFile ); + String checksum = FileUtils.readFileToString( checksumFile, null ); try { digester.verify( file, checksum ); Modified: maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java?rev=630590&r1=630589&r2=630590&view=diff ============================================================================== --- maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java (original) +++ maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java Sat Feb 23 21:12:20 2008 @@ -21,7 +21,6 @@ import org.apache.maven.archiva.converter.artifact.ArtifactConversionException; import org.apache.maven.archiva.converter.artifact.ArtifactConverter; -import org.apache.maven.archiva.converter.artifact.AsciiFileUtil; import org.apache.maven.archiva.converter.artifact.Messages; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; @@ -934,8 +933,8 @@ private static void compareFiles( File expectedPomFile, File pomFile ) throws IOException { - String expectedContent = normalizeString( AsciiFileUtil.readFile( expectedPomFile ) ); - String targetContent = normalizeString( AsciiFileUtil.readFile( pomFile ) ); + String expectedContent = normalizeString( org.apache.commons.io.FileUtils.readFileToString( expectedPomFile, null ) ); + String targetContent = normalizeString( org.apache.commons.io.FileUtils.readFileToString( pomFile, null ) ); assertEquals( "Check file match between " + expectedPomFile + " and " + pomFile, expectedContent, targetContent ); }