From 92362e9ee3b5d2720dd12880ab7a3589f1f84a8d Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 15 Apr 2008 04:44:17 +0000 Subject: Replacing plexus-digest with archiva-checksum git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@648115 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/archiva/web/action/UploadAction.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'archiva-modules/archiva-web') diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java index 26b7800d8..fbaca57ae 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java @@ -28,7 +28,8 @@ import java.util.Calendar; import java.util.Collections; import java.util.List; -import org.apache.maven.archiva.common.utils.Checksums; +import org.apache.archiva.checksum.ChecksumAlgorithm; +import org.apache.archiva.checksum.ChecksummedFile; import org.apache.maven.archiva.common.utils.VersionComparator; import org.apache.maven.archiva.common.utils.VersionUtil; import org.apache.maven.archiva.configuration.ArchivaConfiguration; @@ -137,14 +138,11 @@ public class UploadAction * @plexus.requirement */ private RepositoryContentFactory repositoryFactory; + + private ChecksumAlgorithm[] algorithms = new ChecksumAlgorithm[] { ChecksumAlgorithm.SHA1, ChecksumAlgorithm.MD5 }; private ProjectModelWriter pomWriter = new ProjectModel400Writer(); - /** - * @plexus.requirement - */ - private Checksums checksums; - public void setUpload( File file ) { this.file = file; @@ -422,8 +420,8 @@ public class UploadAction } RepositoryMetadataWriter.write( metadata, metadataFile ); - - checksums.update( metadataFile ); + ChecksummedFile checksum = new ChecksummedFile( metadataFile ); + checksum.fixChecksums( algorithms ); } public void validate() -- cgit v1.2.3