You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ba...@apache.org on 2006/12/09 02:01:11 UTC
svn commit: r484870 - in /maven/archiva/trunk/archiva-reports-standard/src:
main/java/org/apache/maven/archiva/reporting/processor/
test/java/org/apache/maven/archiva/reporting/processor/
test/java/org/apache/maven/archiva/reporting/reporter/
Author: bayard
Date: Fri Dec 8 17:01:08 2006
New Revision: 484870
URL: http://svn.apache.org/viewvc?view=rev&rev=484870
Log:
Moved some of the methods over to IO FileUtils. There is no DirectoryScanner yet or a copyDirectoryStructure method. See https://issues.apache.org/jira/browse/IO-105 for a request for the latter.
Modified:
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/ChecksumArtifactReportProcessor.java
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/ChecksumMetadataReportProcessor.java
maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.java
maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.java
maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/AbstractChecksumArtifactReporterTestCase.java
Modified: maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/ChecksumArtifactReportProcessor.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/ChecksumArtifactReportProcessor.java?view=diff&rev=484870&r1=484869&r2=484870
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/ChecksumArtifactReportProcessor.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/ChecksumArtifactReportProcessor.java Fri Dec 8 17:01:08 2006
@@ -23,7 +23,7 @@
import org.apache.maven.archiva.reporting.database.ReportingDatabase;
import org.codehaus.plexus.digest.Digester;
import org.codehaus.plexus.digest.DigesterException;
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.commons.io.FileUtils;
import java.io.File;
import java.io.IOException;
@@ -77,7 +77,7 @@
{
try
{
- digester.verify( file, FileUtils.fileRead( checksumFile ) );
+ digester.verify( file, FileUtils.readFileToString( checksumFile, null ) );
}
catch ( DigesterException e )
{
Modified: maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/ChecksumMetadataReportProcessor.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/ChecksumMetadataReportProcessor.java?view=diff&rev=484870&r1=484869&r2=484870
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/ChecksumMetadataReportProcessor.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/ChecksumMetadataReportProcessor.java Fri Dec 8 17:01:08 2006
@@ -22,7 +22,7 @@
import org.apache.maven.archiva.reporting.database.ReportingDatabase;
import org.codehaus.plexus.digest.Digester;
import org.codehaus.plexus.digest.DigesterException;
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.commons.io.FileUtils;
import java.io.File;
import java.io.IOException;
@@ -78,7 +78,7 @@
{
try
{
- digester.verify( file, FileUtils.fileRead( checksumFile ) );
+ digester.verify( file, FileUtils.readFileToString( checksumFile, null ) );
}
catch ( DigesterException e )
{
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.java?view=diff&rev=484870&r1=484869&r2=484870
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.java Fri Dec 8 17:01:08 2006
@@ -26,7 +26,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.model.Model;
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.commons.io.FileUtils;
import java.io.File;
import java.util.Collections;
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.java?view=diff&rev=484870&r1=484869&r2=484870
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.java Fri Dec 8 17:01:08 2006
@@ -23,7 +23,7 @@
import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
import org.apache.maven.archiva.reporting.database.ReportingDatabase;
import org.apache.maven.artifact.Artifact;
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.commons.io.FileUtils;
import java.io.File;
import java.text.SimpleDateFormat;
@@ -109,7 +109,7 @@
dir.mkdirs();
String date = new SimpleDateFormat( "yyyyMMdd.HHmmss" ).format( new Date() );
- FileUtils.fileWrite( new File( dir, "artifactId-1.0-alpha-1-" + date + "-1.jar" ).getAbsolutePath(), "foo" );
+ FileUtils.writeStringToFile( new File( dir, "artifactId-1.0-alpha-1-" + date + "-1.jar" ), "foo", null );
Artifact artifact =
createArtifactFromRepository( repository, "groupId", "artifactId", "1.0-alpha-1-" + date + "-1" );
@@ -129,8 +129,8 @@
String date = new SimpleDateFormat( "yyyyMMdd.HHmmss" ).format( new Date() );
for ( int i = 1; i <= 5; i++ )
{
- FileUtils.fileWrite( new File( dir, "artifactId-1.0-alpha-1-" + date + "-" + i + ".jar" ).getAbsolutePath(),
- "foo" );
+ FileUtils.writeStringToFile( new File( dir, "artifactId-1.0-alpha-1-" + date + "-" + i + ".jar" ),
+ "foo", null );
}
for ( int i = 1; i <= 5; i++ )
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/AbstractChecksumArtifactReporterTestCase.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/AbstractChecksumArtifactReporterTestCase.java?view=diff&rev=484870&r1=484869&r2=484870
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/AbstractChecksumArtifactReporterTestCase.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/AbstractChecksumArtifactReporterTestCase.java Fri Dec 8 17:01:08 2006
@@ -18,7 +18,7 @@
import org.codehaus.plexus.digest.Digester;
import org.codehaus.plexus.digest.DigesterException;
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;