You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2006/09/01 06:28:33 UTC
svn commit: r439172 - in /maven/archiva/trunk/archiva-utils/src:
main/java/org/apache/maven/archiva/digest/DigestUtils.java
test/java/org/apache/maven/archiva/digest/DigestUtilsTest.java
Author: brett
Date: Thu Aug 31 21:28:31 2006
New Revision: 439172
URL: http://svn.apache.org/viewvc?rev=439172&view=rev
Log:
[MRM-154] digest utils parses filename incorrectly
Submitted by: Nicolas de Loof (applied with changes)
Added:
maven/archiva/trunk/archiva-utils/src/test/java/org/apache/maven/archiva/digest/DigestUtilsTest.java (with props)
Modified:
maven/archiva/trunk/archiva-utils/src/main/java/org/apache/maven/archiva/digest/DigestUtils.java
Modified: maven/archiva/trunk/archiva-utils/src/main/java/org/apache/maven/archiva/digest/DigestUtils.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-utils/src/main/java/org/apache/maven/archiva/digest/DigestUtils.java?rev=439172&r1=439171&r2=439172&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-utils/src/main/java/org/apache/maven/archiva/digest/DigestUtils.java (original)
+++ maven/archiva/trunk/archiva-utils/src/main/java/org/apache/maven/archiva/digest/DigestUtils.java Thu Aug 31 21:28:31 2006
@@ -42,7 +42,7 @@
if ( m.matches() )
{
String filename = m.group( 1 );
- if ( !path.endsWith( filename ) )
+ if ( !filename.endsWith( path ) )
{
throw new DigesterException( "Supplied checksum does not match checksum pattern" );
}
@@ -55,7 +55,7 @@
if ( m.matches() )
{
String filename = m.group( 2 );
- if ( !path.endsWith( filename ) )
+ if ( !filename.endsWith( path ) )
{
throw new DigesterException( "Supplied checksum does not match checksum pattern" );
}
Added: maven/archiva/trunk/archiva-utils/src/test/java/org/apache/maven/archiva/digest/DigestUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-utils/src/test/java/org/apache/maven/archiva/digest/DigestUtilsTest.java?rev=439172&view=auto
==============================================================================
--- maven/archiva/trunk/archiva-utils/src/test/java/org/apache/maven/archiva/digest/DigestUtilsTest.java (added)
+++ maven/archiva/trunk/archiva-utils/src/test/java/org/apache/maven/archiva/digest/DigestUtilsTest.java Thu Aug 31 21:28:31 2006
@@ -0,0 +1,36 @@
+package org.apache.maven.archiva.digest;
+
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import junit.framework.TestCase;
+
+public class DigestUtilsTest
+ extends TestCase
+{
+ public void testCleanChecksum()
+ throws DigesterException
+ {
+ // SHA1 checksum from www.ibiblio.org/maven2, incuding file path
+ DigestUtils.cleanChecksum(
+ "bcc82975c0f9c681fcb01cc38504c992553e93ba /home/projects/maven/repository-staging/to-ibiblio/maven2/servletapi/servletapi/2.4/servletapi-2.4.pom",
+ "SHA1", "servletapi/servletapi/2.4/servletapi-2.4.pom" );
+
+ DigestUtils.cleanChecksum(
+ "SHA1(/home/projects/maven/repository-staging/to-ibiblio/maven2/servletapi/servletapi/2.4/servletapi-2.4.pom)=bcc82975c0f9c681fcb01cc38504c992553e93ba",
+ "SHA1", "servletapi/servletapi/2.4/servletapi-2.4.pom" );
+ }
+}
Propchange: maven/archiva/trunk/archiva-utils/src/test/java/org/apache/maven/archiva/digest/DigestUtilsTest.java
------------------------------------------------------------------------------
svn:eol-style = native