You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2008/04/12 05:53:17 UTC
svn commit: r647370 - in /archiva/sandbox/archiva-checksum/src:
main/java/org/apache/archiva/checksum/ test/java/org/apache/archiva/checksum/
Author: joakime
Date: Fri Apr 11 20:53:15 2008
New Revision: 647370
URL: http://svn.apache.org/viewvc?rev=647370&view=rev
Log:
Renaming ChecksumFile to ChecksummedFile
Added:
archiva/sandbox/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java
- copied, changed from r647369, archiva/sandbox/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksumFile.java
archiva/sandbox/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksummedFileTest.java
- copied, changed from r647369, archiva/sandbox/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumFileTest.java
Removed:
archiva/sandbox/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksumFile.java
archiva/sandbox/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumFileTest.java
Copied: archiva/sandbox/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java (from r647369, archiva/sandbox/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksumFile.java)
URL: http://svn.apache.org/viewvc/archiva/sandbox/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java?p2=archiva/sandbox/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java&p1=archiva/sandbox/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksumFile.java&r1=647369&r2=647370&rev=647370&view=diff
==============================================================================
--- archiva/sandbox/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksumFile.java (original)
+++ archiva/sandbox/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java Fri Apr 11 20:53:15 2008
@@ -36,7 +36,7 @@
import org.slf4j.LoggerFactory;
/**
- * ChecksumFile
+ * ChecksummedFile
*
* <dl>
* <lh>Terminology:</lh>
@@ -52,18 +52,18 @@
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
*/
-public class ChecksumFile
+public class ChecksummedFile
{
- private Logger log = LoggerFactory.getLogger( ChecksumFile.class );
+ private Logger log = LoggerFactory.getLogger( ChecksummedFile.class );
private final File referenceFile;
/**
- * Construct a ChecksumFile object.
+ * Construct a ChecksummedFile object.
*
* @param referenceFile
*/
- public ChecksumFile(final File referenceFile) {
+ public ChecksummedFile(final File referenceFile) {
this.referenceFile = referenceFile;
}
Copied: archiva/sandbox/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksummedFileTest.java (from r647369, archiva/sandbox/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumFileTest.java)
URL: http://svn.apache.org/viewvc/archiva/sandbox/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksummedFileTest.java?p2=archiva/sandbox/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksummedFileTest.java&p1=archiva/sandbox/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumFileTest.java&r1=647369&r2=647370&rev=647370&view=diff
==============================================================================
--- archiva/sandbox/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumFileTest.java (original)
+++ archiva/sandbox/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksummedFileTest.java Fri Apr 11 20:53:15 2008
@@ -26,12 +26,12 @@
import org.apache.commons.lang.StringUtils;
/**
- * ChecksumFileTest
+ * ChecksummedFileTest
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
*/
-public class ChecksumFileTest
+public class ChecksummedFileTest
extends AbstractChecksumTestCase
{
/** SHA1 checksum from www.ibiblio.org/maven2, incuding file path */
@@ -41,9 +41,9 @@
throws IOException
{
File testfile = getTestResource( "examples/redback-authz-open.jar" );
- ChecksumFile checksumFile = new ChecksumFile( testfile );
+ ChecksummedFile checksummedFile = new ChecksummedFile( testfile );
String expectedChecksum = "2bb14b388973351b0a4dfe11d171965f59cc61a1";
- String actualChecksum = checksumFile.calculateChecksum( ChecksumAlgorithm.SHA1 );
+ String actualChecksum = checksummedFile.calculateChecksum( ChecksumAlgorithm.SHA1 );
assertEquals( expectedChecksum, actualChecksum );
}
@@ -51,9 +51,9 @@
throws IOException
{
File testfile = getTestResource( "examples/redback-authz-open.jar" );
- ChecksumFile checksumFile = new ChecksumFile( testfile );
+ ChecksummedFile checksummedFile = new ChecksummedFile( testfile );
String expectedChecksum = "f42047fe2e177ac04d0df7aa44d408be";
- String actualChecksum = checksumFile.calculateChecksum( ChecksumAlgorithm.MD5 );
+ String actualChecksum = checksummedFile.calculateChecksum( ChecksumAlgorithm.MD5 );
assertEquals( expectedChecksum, actualChecksum );
}
@@ -64,8 +64,8 @@
+ " /home/projects/maven/repository-staging/to-ibiblio/maven2/servletapi/servletapi/2.4/servletapi-2.4.pom";
File testfile = getTestResource( "examples/redback-authz-open.jar" );
- ChecksumFile checksumFile = new ChecksumFile( testfile );
- String s = checksumFile.parseChecksum( expected, ChecksumAlgorithm.SHA1,
+ ChecksummedFile checksummedFile = new ChecksummedFile( testfile );
+ String s = checksummedFile.parseChecksum( expected, ChecksumAlgorithm.SHA1,
"servletapi/servletapi/2.4/servletapi-2.4.pom" );
assertEquals( "Checksum doesn't match", SERVLETAPI_SHA1, s );
@@ -76,8 +76,8 @@
{
String expected = SERVLETAPI_SHA1 + " -";
File testfile = getTestResource( "examples/redback-authz-open.jar" );
- ChecksumFile checksumFile = new ChecksumFile( testfile );
- String s = checksumFile.parseChecksum( expected, ChecksumAlgorithm.SHA1,
+ ChecksummedFile checksummedFile = new ChecksummedFile( testfile );
+ String s = checksummedFile.parseChecksum( expected, ChecksumAlgorithm.SHA1,
"servletapi/servletapi/2.4/servletapi-2.4.pom" );
assertEquals( "Checksum doesn't match", SERVLETAPI_SHA1, s );
}
@@ -87,25 +87,25 @@
{
String expected = "SHA1(-)=" + SERVLETAPI_SHA1;
File testfile = getTestResource( "examples/redback-authz-open.jar" );
- ChecksumFile checksumFile = new ChecksumFile( testfile );
- String s = checksumFile.parseChecksum( expected, ChecksumAlgorithm.SHA1,
+ ChecksummedFile checksummedFile = new ChecksummedFile( testfile );
+ String s = checksummedFile.parseChecksum( expected, ChecksumAlgorithm.SHA1,
"servletapi/servletapi/2.4/servletapi-2.4.pom" );
assertEquals( "Checksum doesn't match", SERVLETAPI_SHA1, s );
}
public void testGetChecksumFile()
{
- ChecksumFile checksumFile = new ChecksumFile( new File("test.jar") );
- assertEquals( "test.jar.sha1", checksumFile.getChecksumFile( ChecksumAlgorithm.SHA1 ).getName() );
+ ChecksummedFile checksummedFile = new ChecksummedFile( new File("test.jar") );
+ assertEquals( "test.jar.sha1", checksummedFile.getChecksumFile( ChecksumAlgorithm.SHA1 ).getName() );
}
public void testCreateChecksum()
throws IOException
{
File testableJar = createTestableJar( "examples/redback-authz-open.jar" );
- ChecksumFile checksumFile = new ChecksumFile( testableJar );
- checksumFile.createChecksum( ChecksumAlgorithm.SHA1 );
- File hashFile = checksumFile.getChecksumFile( ChecksumAlgorithm.SHA1 );
+ ChecksummedFile checksummedFile = new ChecksummedFile( testableJar );
+ checksummedFile.createChecksum( ChecksumAlgorithm.SHA1 );
+ File hashFile = checksummedFile.getChecksumFile( ChecksumAlgorithm.SHA1 );
assertTrue( "ChecksumAlgorithm file should exist.", hashFile.exists() );
String hashContents = FileUtils.readFileToString( hashFile );
hashContents = StringUtils.trim( hashContents );