Author: oching
Date: Thu Feb 25 10:14:17 2010
New Revision: 916217
URL: http://svn.apache.org/viewvc?rev=916217&view=rev
Log:
[MRM-1312] mda5 and sha are not generated for snapshot jars
merge from 1.3.x branch -r916197 with a few tweaks in variable name in
UploadArtifactTest to resolve conflict
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java?rev=916217&r1=916216&r2=916217&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
Thu Feb 25 10:14:17 2010
@@ -359,7 +359,7 @@
{
copyFile( artifactFile, targetPath, filename, fixChecksums
);
triggerAuditEvent( repository.getId(), path + "/" +
filename, AuditEvent.UPLOAD_FILE );
- queueRepositoryTask( repository.getId(),
repository.toFile( artifactReference ) );
+ queueRepositoryTask( repository.getId(), targetFile );
}
}
catch ( IOException ie )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java?rev=916217&r1=916216&r2=916217&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java
Thu Feb 25 10:14:17 2010
@@ -526,7 +526,9 @@
control.verify();
String repoLocation = config.findManagedRepositoryById( REPOSITORY_ID
).getLocation();
- assertEquals( 6, new File( repoLocation,
"/org/apache/archiva/artifact-upload/1.0-SNAPSHOT/" ).list().length );
+ String[] artifactsList = new File( repoLocation,
"/org/apache/archiva/artifact-upload/1.0-SNAPSHOT/" ).list();
+
+ assertEquals( 6, artifactsList.length );
assertTrue(
new File( repoLocation, "/org/apache/archiva/artifact-upload/" +
MetadataTools.MAVEN_METADATA ).exists() );
@@ -534,6 +536,79 @@
".sha1" ).exists() );
assertTrue( new File( repoLocation,
"/org/apache/archiva/artifact-upload/" + MetadataTools.MAVEN_METADATA +
".md5" ).exists() );
+
+ int startIndex = "artifact-upload-1.0-".length();
+ int endIndex = -1;
+
+ if ( artifactsList[0].contains( "jar" ) )
+ {
+ endIndex = artifactsList[0].indexOf( ".jar" );
+ }
+ else
+ {
+ endIndex = artifactsList[0].indexOf( ".pom" );
+ }
+
+ String actualTimestamp = artifactsList[0].substring( startIndex,
endIndex );
+
+ assertTrue( new File( repoLocation,
"/org/apache/archiva/artifact-upload/1.0-SNAPSHOT/artifact-upload-1.0-" +
actualTimestamp + ".jar" ).exists() );
+ assertTrue( new File( repoLocation,
"/org/apache/archiva/artifact-upload/1.0-SNAPSHOT/artifact-upload-1.0-" +
actualTimestamp + ".jar.md5" ).exists() );
+ assertTrue( new File( repoLocation,
"/org/apache/archiva/artifact-upload/1.0-SNAPSHOT/artifact-upload-1.0-" +
actualTimestamp + ".jar.sha1" ).exists() );
+ assertTrue( new File( repoLocation,
"/org/apache/archiva/artifact-upload/1.0-SNAPSHOT/artifact-upload-1.0-" +
actualTimestamp + ".pom" ).exists() );
+ assertTrue( new File( repoLocation,
"/org/apache/archiva/artifact-upload/1.0-SNAPSHOT/artifact-upload-1.0-" +
actualTimestamp + ".pom.md5" ).exists() );
+ assertTrue( new File( repoLocation,
"/org/apache/archiva/artifact-upload/1.0-SNAPSHOT/artifact-upload-1.0-" +
actualTimestamp + ".pom.sha1" ).exists() );
+
+ // verify checksums of jar file
+ ChecksummedFile checksum =
+ new ChecksummedFile( new File( repoLocation,
+
"/org/apache/archiva/artifact-upload/1.0-SNAPSHOT/artifact-upload-1.0-" +
actualTimestamp + ".jar" ) );
+ String sha1 = checksum.calculateChecksum( ChecksumAlgorithm.SHA1 );
+ String md5 = checksum.calculateChecksum( ChecksumAlgorithm.MD5 );
+
+ String contents =
+ FileUtils.readFileToString( new File( repoLocation,
+
"/org/apache/archiva/artifact-upload/1.0-SNAPSHOT/artifact-upload-1.0-" +
actualTimestamp + ".jar.sha1" ) );
+ assertTrue( StringUtils.contains( contents, sha1 ) );
+
+ contents =
+ FileUtils.readFileToString( new File( repoLocation,
+
"/org/apache/archiva/artifact-upload/1.0-SNAPSHOT/artifact-upload-1.0-" +
actualTimestamp + ".jar.md5" ) );
+ assertTrue( StringUtils.contains( contents, md5 ) );
+
+ // verify checksums of pom file
+ checksum =
+ new ChecksummedFile( new File( repoLocation,
+
"/org/apache/archiva/artifact-upload/1.0-SNAPSHOT/artifact-upload-1.0-" +
actualTimestamp + ".pom" ) );
+ sha1 = checksum.calculateChecksum( ChecksumAlgorithm.SHA1 );
+ md5 = checksum.calculateChecksum( ChecksumAlgorithm.MD5 );
+
+ contents =
+ FileUtils.readFileToString( new File( repoLocation,
+
"/org/apache/archiva/artifact-upload/1.0-SNAPSHOT/artifact-upload-1.0-" +
actualTimestamp + ".pom.sha1" ) );
+ assertTrue( StringUtils.contains( contents, sha1 ) );
+
+ contents =
+ FileUtils.readFileToString( new File( repoLocation,
+
"/org/apache/archiva/artifact-upload/1.0-SNAPSHOT/artifact-upload-1.0-" +
actualTimestamp + ".pom.md5" ) );
+ assertTrue( StringUtils.contains( contents, md5 ) );
+
+
+ // verify checksums of metadata file
+ checksum =
+ new ChecksummedFile( new File( repoLocation,
"/org/apache/archiva/artifact-upload/" +
+ MetadataTools.MAVEN_METADATA ) );
+ sha1 = checksum.calculateChecksum( ChecksumAlgorithm.SHA1 );
+ md5 = checksum.calculateChecksum( ChecksumAlgorithm.MD5 );
+
+ contents =
+ FileUtils.readFileToString( new File( repoLocation,
"/org/apache/archiva/artifact-upload/" +
+ MetadataTools.MAVEN_METADATA + ".sha1" ) );
+ assertTrue( StringUtils.contains( contents, sha1 ) );
+
+ contents =
+ FileUtils.readFileToString( new File( repoLocation,
"/org/apache/archiva/artifact-upload/" +
+ MetadataTools.MAVEN_METADATA + ".md5" ) );
+ assertTrue( StringUtils.contains( contents, md5 ) );
}
public void testChecksumIsCorrectWhenArtifactIsReUploaded()
