svn commit: r1346611 - in /archiva/trunk/archiva-modules: archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/

[olamy]

Author: olamy
Date: Tue Jun  5 21:43:53 2012
New Revision: 1346611

URL: http://svn.apache.org/viewvc?rev=1346611&view=rev
Log:
when deleting an artifact md5 and sha1 must be deleted too

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContent.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContent.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContent.java?rev=1346611&r1=1346610&r2=1346611&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContent.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContent.java
 Tue Jun  5 21:43:53 2012
@@ -86,6 +86,20 @@ public class ManagedDefaultRepositoryCon
         {
             FileUtils.deleteQuietly( filePath );
         }
+
+        File filePathmd5 = new File( getRepoRoot(), path + ".md5" );
+
+        if ( filePathmd5.exists() )
+        {
+            FileUtils.deleteQuietly( filePathmd5 );
+        }
+
+        File filePathsha1 = new File( getRepoRoot(), path + ".sha1" );
+
+        if ( filePathsha1.exists() )
+        {
+            FileUtils.deleteQuietly( filePathsha1 );
+        }
     }
 
     public String getId()

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java?rev=1346611&r1=1346610&r2=1346611&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
 Tue Jun  5 21:43:53 2012
@@ -213,8 +213,17 @@ public class RepositoriesServiceTest
             File artifactFile = new File(
                 
"target/test-origin-repo/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1-javadoc.jar"
 );
 
+            File artifactFilemd5 = new File(
+                
"target/test-origin-repo/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1-javadoc.jar.md5"
 );
+
+            File artifactFilesha1 = new File(
+                
"target/test-origin-repo/commons-logging/commons-logging/1.0.1/commons-logging-1.0.1-javadoc.jar.sha1"
 );
+
             assertTrue( "artifact not exists:" + artifactFile.getPath(), 
artifactFile.exists() );
 
+            assertTrue( "md5 not exists:" + artifactFilemd5.getPath(), 
artifactFilemd5.exists() );
+            assertTrue( "sha1 not exists:" + artifactFilesha1.getPath(), 
artifactFilesha1.exists() );
+
             Artifact artifact = new Artifact();
             artifact.setGroupId( "commons-logging" );
             artifact.setArtifactId( "commons-logging" );
@@ -228,6 +237,8 @@ public class RepositoriesServiceTest
             repositoriesService.deleteArtifact( artifact );
 
             assertFalse( "artifact not deleted exists:" + 
artifactFile.getPath(), artifactFile.exists() );
+            assertFalse( "md5 still exists:" + artifactFilemd5.getPath(), 
artifactFilemd5.exists() );
+            assertFalse( "sha1 still exists:" + artifactFilesha1.getPath(), 
artifactFilesha1.exists() );
 
             artifacts =
                 browseService.getArtifactDownloadInfos( "commons-logging", 
"commons-logging", "1.0.1", SOURCE_REPO_ID );