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:50:28 UTC
svn commit: r1049382 - in /archiva/trunk/archiva-modules/archiva-base: ./
archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/
archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers...
Author: brett
Date: Wed Dec 15 01:50:28 2010
New Revision: 1049382
URL: http://svn.apache.org/viewvc?rev=1049382&view=rev
Log:
[MRM-1396] Purge task problem : Not enough parts to the path
Merged from: r1049375
Modified:
archiva/trunk/archiva-modules/archiva-base/ (props changed)
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java (props changed)
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
Propchange: archiva/trunk/archiva-modules/archiva-base/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 15 01:50:28 2010
@@ -0,0 +1,7 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-base:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-base:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-base:953645,1049375
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-base:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-base:699795-705848
+/archiva/tags/archiva-1.3/archiva-modules/archiva-base:898632
+/archiva/trunk/archiva-modules/archiva-base:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 15 01:50:28 2010
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:1049375
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:898632
Modified: archiva/trunk/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/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java?rev=1049382&r1=1049381&r2=1049382&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java (original)
+++ archiva/trunk/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:50:28 2010
@@ -192,7 +192,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/trunk/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/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java?rev=1049382&r1=1049381&r2=1049382&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java (original)
+++ archiva/trunk/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:50:28 2010
@@ -36,7 +36,9 @@ import java.util.Collections;
*/
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-plugin-2.3-SNAPSHOT.jar" );
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
{