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 2010/12/15 02:21:23 UTC
svn commit: r1049375 - in /archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src: main/java/org/apache/maven/archiva/consumers/core/repository/ test/java/org/apache/maven/archiva/consumers/core/reposit...

Author: brett
Date: Wed Dec 15 01:21:23 2010
New Revision: 1049375

URL: http://svn.apache.org/viewvc?rev=1049375&view=rev
Log:
[MRM-1396] Purge task problem : Not enough parts to the path

Modified:
    archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
    archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java

Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java?rev=1049375&r1=1049374&r2=1049375&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java Wed Dec 15 01:21:23 2010
@@ -191,7 +191,7 @@ public class CleanupReleasedSnapshotsRep
         }
         catch ( LayoutException e )
         {
-            throw new RepositoryPurgeException( e.getMessage(), e );
+            log.debug( "Not processing file that is not an artifact: " + e.getMessage() );
         }
         catch ( ContentNotFoundException e )
         {

Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java?rev=1049375&r1=1049374&r2=1049375&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java Wed Dec 15 01:21:23 2010
@@ -36,7 +36,9 @@ import org.easymock.MockControl;
  */
 public class CleanupReleasedSnapshotsRepositoryPurgeTest
     extends AbstractRepositoryPurgeTest
-{  
+{
+    private static final String INDEX_PATH = ".index\\nexus-maven-repository-index.zip";
+
     private ArchivaConfiguration archivaConfiguration;
 
     public static final String PATH_TO_RELEASED_SNAPSHOT_IN_DIFF_REPO =
@@ -80,7 +82,7 @@ public class CleanupReleasedSnapshotsRep
                                                                   "2.3-SNAPSHOT", "maven-plugin" ) );
         listenerControl.replay();
         
-        repoPurge.process( CleanupReleasedSnapshotsRepositoryPurgeTest.PATH_TO_RELEASED_SNAPSHOT_IN_SAME_REPO );
+        repoPurge.process( PATH_TO_RELEASED_SNAPSHOT_IN_SAME_REPO );
         
         listenerControl.verify();
 
@@ -122,6 +124,29 @@ public class CleanupReleasedSnapshotsRep
         XMLAssert.assertXpathEvaluatesTo( "20070315032817", "//metadata/versioning/lastUpdated", metadataXml );
     }
     
+    public void testNonArtifactFile()
+        throws Exception
+    {
+        Configuration config = archivaConfiguration.getConfiguration();
+        config.removeManagedRepository( config.findManagedRepositoryById( TEST_REPO_ID ) );
+        config.addManagedRepository( getRepoConfiguration( TEST_REPO_ID, TEST_REPO_NAME ) );
+
+        String repoRoot = prepareTestRepos();
+
+        // test listeners for the correct artifacts
+        listenerControl.replay();
+
+        File file = new File( repoRoot, INDEX_PATH );
+        file.createNewFile();
+        assertTrue( file.exists() );
+
+        repoPurge.process( INDEX_PATH );
+
+        listenerControl.verify();
+
+        assertTrue( file.exists() );
+    }
+
     public void testReleasedSnapshotsExistsInDifferentRepo()
         throws Exception
     {