diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurge.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
index c10450398..5c05a2a66 100644
--- a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
@@ -24,13 +24,11 @@ import org.apache.maven.archiva.repository.layout.LayoutException;
import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout;
import org.apache.maven.archiva.common.utils.VersionUtil;
import org.apache.maven.archiva.configuration.RepositoryConfiguration;
-import org.apache.maven.archiva.configuration.Configuration;
-import org.apache.maven.archiva.indexer.RepositoryIndexException;
import org.apache.maven.archiva.model.ArchivaRepository;
import org.apache.maven.archiva.database.ArtifactDAO;
+import org.apache.commons.lang.StringUtils;
import java.util.Calendar;
-import java.util.GregorianCalendar;
import java.io.File;
/**
@@ -66,25 +64,57 @@ public class DaysOldRepositoryPurge
FilenameParts parts = getFilenameParts( path );
- if ( VersionUtil.isSnapshot( parts.version ) )
- {
- Calendar olderThanThisDate = Calendar.getInstance();
- olderThanThisDate.add( Calendar.DATE, ( -1 * repoConfig.getDaysOlder() ) );
+ Calendar olderThanThisDate = Calendar.getInstance();
+ olderThanThisDate.add( Calendar.DATE, ( -1 * repoConfig.getDaysOlder() ) );
+ if ( VersionUtil.isGenericSnapshot( parts.version ) )
+ {
if ( artifactFile.lastModified() < olderThanThisDate.getTimeInMillis() )
{
- String[] fileParts = artifactFile.getName().split( "." + parts.extension );
-
- File[] artifactFiles = getFiles( artifactFile.getParentFile(), fileParts[0] );
-
- purge( artifactFiles );
+ doPurge( artifactFile, parts.extension );
}
}
+ else if ( VersionUtil.isUniqueSnapshot( parts.version ) )
+ {
+ String[] versionParts = StringUtils.split( parts.version, '-' );
+ String timestamp = StringUtils.remove( versionParts[1], '.' );
+ int year = Integer.parseInt( StringUtils.substring( timestamp, 0, 4 ) );
+ int month = Integer.parseInt( StringUtils.substring( timestamp, 4, 6 ) ) - 1;
+ int day = Integer.parseInt( StringUtils.substring( timestamp, 6, 8 ) );
+ int hour = Integer.parseInt( StringUtils.substring( timestamp, 8, 10 ) );
+ int min = Integer.parseInt( StringUtils.substring( timestamp, 10, 12 ) );
+ int sec = Integer.parseInt( StringUtils.substring( timestamp, 12 ) );
+
+ Calendar timestampDate = Calendar.getInstance();
+ timestampDate.set( year, month, day, hour, min, sec );
+
+ if( timestampDate.getTimeInMillis() < olderThanThisDate.getTimeInMillis() )
+ {
+ doPurge( artifactFile, parts.extension );
+ }
+ else
+ {
+ if ( artifactFile.lastModified() < olderThanThisDate.getTimeInMillis() )
+ {
+ doPurge( artifactFile, parts.extension );
+ }
+ }
+ }
+
}
catch ( LayoutException le )
{
throw new RepositoryPurgeException( le.getMessage() );
}
}
-
+
+ private void doPurge( File artifactFile, String extension )
+ {
+ String[] fileParts = artifactFile.getName().split( "." + extension );
+
+ File[] artifactFiles = getFiles( artifactFile.getParentFile(), fileParts[0] );
+
+ purge( artifactFiles );
+ }
}
+
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
index fd162de8c..040acb57a 100644
--- a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
@@ -59,7 +59,10 @@ public class AbstractRepositoryPurgeTest
public static final int TEST_DAYS_OLDER = 30;
public static final String PATH_TO_BY_DAYS_OLD_ARTIFACT =
- "org/apache/maven/plugins/maven-install-plugin/2.2-SNAPSHOT/maven-install-plugin-2.2-SNAPSHOT.jar";
+ "org/apache/maven/plugins/maven-install-plugin/2.2-SNAPSHOT/maven-install-plugin-2.2-SNAPSHOT.jar";
+
+ public static final String PATH_TO_BY_DAYS_OLD_METADATA_DRIVEN_ARTIFACT =
+ "org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070113.163208-4.jar";
public static final String PATH_TO_BY_RETENTION_COUNT_ARTIFACT =
"org/jruby/plugins/jruby-rake-plugin/1.0RC1-SNAPSHOT/jruby-rake-plugin-1.0RC1-20070504.153317-1.jar";
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
index a96efa1e4..e2be47500 100644
--- a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
@@ -31,7 +31,7 @@ import java.io.File;
public class DaysOldRepositoryPurgeTest
extends AbstractRepositoryPurgeTest
{
-
+
protected void setUp()
throws Exception
{
@@ -40,10 +40,9 @@ public class DaysOldRepositoryPurgeTest
repoPurge = new DaysOldRepositoryPurge( getRepository(), getLayout(), dao, getRepoConfiguration() );
}
- private void setLastModified()
+ private void setLastModified( String dirPath )
{
- File dir =
- new File( "target/test/test-repo/org/apache/maven/plugins/maven-install-plugin/2.2-SNAPSHOT/" );
+ File dir = new File( dirPath );
File[] contents = dir.listFiles();
for ( int i = 0; i < contents.length; i++ )
{
@@ -51,15 +50,15 @@ public class DaysOldRepositoryPurgeTest
}
}
- public void testIfAJarIsFound()
+ public void testByLastModified()
throws Exception
{
- populateDb();
+ populateDbForTestByLastModified();
File testDir = new File( "target/test" );
FileUtils.copyDirectoryToDirectory( new File( "target/test-classes/test-repo" ), testDir );
- setLastModified();
+ setLastModified( "target/test/test-repo/org/apache/maven/plugins/maven-install-plugin/2.2-SNAPSHOT/" );
repoPurge.process( PATH_TO_BY_DAYS_OLD_ARTIFACT );
@@ -79,6 +78,64 @@ public class DaysOldRepositoryPurgeTest
FileUtils.deleteDirectory( testDir );
}
+ public void testMetadataDrivenSnapshots()
+ throws Exception
+ {
+ populateDbForTestMetadataDrivenSnapshots();
+
+ File testDir = new File( "target/test" );
+ FileUtils.copyDirectoryToDirectory( new File( "target/test-classes/test-repo" ), testDir );
+
+ repoPurge.process( PATH_TO_BY_DAYS_OLD_METADATA_DRIVEN_ARTIFACT );
+
+ // this should be deleted since the filename version (timestamp) is older than
+ // 100 days even if the last modified date was <100 days ago
+ assertFalse( new File(
+ "target/test/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070113.163208-4.jar" ).exists() );
+ assertFalse( new File(
+ "target/test/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070113.163208-4.jar.sha1" ).exists() );
+ assertFalse( new File(
+ "target/test/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070113.163208-4.pom" ).exists() );
+ assertFalse( new File(
+ "target/test/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070113.163208-4.pom.sha1" ).exists() );
+
+ // musn't be deleted since the filename version (timestamp) is not older than 100 days
+ assertTrue( new File(
+ "target/test/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070618.102615-5.jar" ).exists() );
+ assertTrue( new File(
+ "target/test/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070618.102615-5.jar.sha1" ).exists() );
+ assertTrue( new File(
+ "target/test/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070618.102615-5.pom" ).exists() );
+ assertTrue( new File(
+ "target/test/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070618.102615-5.pom.sha1" ).exists() );
+
+ assertTrue( new File(
+ "target/test/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070630.113158-6.jar" ).exists() );
+ assertTrue( new File(
+ "target/test/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070630.113158-6.jar.sha1" ).exists() );
+ assertTrue( new File(
+ "target/test/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070630.113158-6.pom" ).exists() );
+ assertTrue( new File(
+ "target/test/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070630.113158-6.pom.sha1" ).exists() );
+
+ assertTrue( new File(
+ "target/test/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070707.122114-7.jar" ).exists() );
+ assertTrue( new File(
+ "target/test/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070707.122114-7.jar.sha1" ).exists() );
+ assertTrue( new File(
+ "target/test/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070707.122114-7.pom" ).exists() );
+ assertTrue( new File(
+ "target/test/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070707.122114-7.pom.sha1" ).exists() );
+
+ // mustn't be deleted since the last modified date is <100 days (this is not a timestamped version)
+ assertTrue( new File(
+ "target/test/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.jar" ).exists() );
+ assertTrue( new File(
+ "target/test/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.pom" ).exists() );
+
+ FileUtils.deleteDirectory( testDir );
+ }
+
protected void tearDown()
throws Exception
{
@@ -86,7 +143,7 @@ public class DaysOldRepositoryPurgeTest
repoPurge = null;
}
- private void populateDb()
+ private void populateDbForTestByLastModified()
throws Exception
{
List versions = new ArrayList();
@@ -94,4 +151,17 @@ public class DaysOldRepositoryPurgeTest
populateDb( "org.apache.maven.plugins", "maven-install-plugin", versions );
}
+
+ private void populateDbForTestMetadataDrivenSnapshots()
+ throws Exception
+ {
+ List versions = new ArrayList();
+ versions.add( "1.4.3-20070113.163208-4" );
+ versions.add( "1.4.3-20070618.102615-5" );
+ versions.add( "1.4.3-20070630.113158-6" );
+ versions.add( "1.4.3-20070707.122114-7" );
+ versions.add( "1.4.3-SNAPSHOT" );
+
+ populateDb( "org.codehaus.plexus", "plexus-utils", versions );
+ }
}
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/maven-metadata-codehaus-snapshots.xml b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/maven-metadata-codehaus-snapshots.xml
new file mode 100644
index 000000000..10e90ce2c
--- /dev/null
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/maven-metadata-codehaus-snapshots.xml
@@ -0,0 +1,12 @@
+
+ org.codehaus.plexus
+ plexus-utils
+ 1.4.3-SNAPSHOT
+
+
+ 20070707.122114
+ 7
+
+ 20070707122118
+
+
\ No newline at end of file
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/maven-metadata-codehaus-snapshots.xml.sha1 b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/maven-metadata-codehaus-snapshots.xml.sha1
new file mode 100644
index 000000000..be15aa0f0
--- /dev/null
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/maven-metadata-codehaus-snapshots.xml.sha1
@@ -0,0 +1 @@
+9bf3732f0d4f32363e3331630def1832ab991007
\ No newline at end of file
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070113.163208-4.jar b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070113.163208-4.jar
new file mode 100644
index 000000000..8894327ac
Binary files /dev/null and b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070113.163208-4.jar differ
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070113.163208-4.jar.sha1 b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070113.163208-4.jar.sha1
new file mode 100644
index 000000000..08f91f4ba
--- /dev/null
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070113.163208-4.jar.sha1
@@ -0,0 +1 @@
+4055e3444fc6be00eafe634ea738930b22cf5475
\ No newline at end of file
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070113.163208-4.pom b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070113.163208-4.pom
new file mode 100644
index 000000000..c7985f223
--- /dev/null
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070113.163208-4.pom
@@ -0,0 +1,52 @@
+
+
+ plexus
+ org.codehaus.plexus
+ 1.0.11
+ ../pom/pom.xml
+
+ 4.0.0
+ plexus-utils
+ Plexus Common Utilities
+ 1.4.3-20070613.163208-4
+ http://plexus.codehaus.org/plexus-utils
+
+ scm:svn:http://svn.codehaus.org/plexus/plexus-utils/trunk/
+ scm:svn:https://svn.codehaus.org/plexus/plexus-utils/trunk
+ http://fisheye.codehaus.org/browse/plexus/plexus-utils/trunk/
+
+
+
+
+ maven-compiler-plugin
+
+
+ 1.3
+
+
+
+ maven-surefire-plugin
+
+ true
+
+ org/codehaus/plexus/util/FileBasedTestCase.java
+ **/Test*.java
+
+
+
+
+
+
+
+
+ maven-javadoc-plugin
+
+
+ maven-jxr-plugin
+
+
+
+
+ deployed
+
+
\ No newline at end of file
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070113.163208-4.pom.sha1 b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070113.163208-4.pom.sha1
new file mode 100644
index 000000000..9b3c7143d
--- /dev/null
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070113.163208-4.pom.sha1
@@ -0,0 +1 @@
+8f771b7916b90153ff2c1ba0f3102df6faa08652
\ No newline at end of file
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070618.102615-5.jar b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070618.102615-5.jar
new file mode 100644
index 000000000..2855ccfc1
Binary files /dev/null and b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070618.102615-5.jar differ
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070618.102615-5.jar.sha1 b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070618.102615-5.jar.sha1
new file mode 100644
index 000000000..959b866dd
--- /dev/null
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070618.102615-5.jar.sha1
@@ -0,0 +1 @@
+a2237ddc9e7925b4badd748afd7f62ec0a800630
\ No newline at end of file
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070618.102615-5.pom b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070618.102615-5.pom
new file mode 100644
index 000000000..3587217e1
--- /dev/null
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070618.102615-5.pom
@@ -0,0 +1,61 @@
+
+
+ plexus
+ org.codehaus.plexus
+ 1.0.11
+ ../pom/pom.xml
+
+ 4.0.0
+ plexus-utils
+ Plexus Common Utilities
+ 1.4.3-SNAPSHOT
+ http://plexus.codehaus.org/plexus-utils
+
+
+
+ maven-compiler-plugin
+
+
+
+ 1.3
+
+
+
+ maven-surefire-plugin
+
+
+ true
+
+ org/codehaus/plexus/util/FileBasedTestCase.java
+ **/Test*.java
+
+
+
+ JAVA_HOME
+ ${JAVA_HOME}
+
+
+ M2_HOME
+ ${M2_HOME}
+
+
+
+
+
+
+
+ scm:svn:http://svn.codehaus.org/plexus/plexus-utils/trunk/
+ scm:svn:https://svn.codehaus.org/plexus/plexus-utils/trunk
+ http://fisheye.codehaus.org/browse/plexus/plexus-utils/trunk/
+
+
+
+
+ maven-javadoc-plugin
+
+
+ maven-jxr-plugin
+
+
+
+
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070618.102615-5.pom.sha1 b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070618.102615-5.pom.sha1
new file mode 100644
index 000000000..2cd9afc58
--- /dev/null
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070618.102615-5.pom.sha1
@@ -0,0 +1 @@
+730554bce63d59d4411f971397adee9ad2e63ce5
\ No newline at end of file
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070630.113158-6.jar b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070630.113158-6.jar
new file mode 100644
index 000000000..1cdf233e2
Binary files /dev/null and b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070630.113158-6.jar differ
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070630.113158-6.jar.sha1 b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070630.113158-6.jar.sha1
new file mode 100644
index 000000000..b95864cb7
--- /dev/null
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070630.113158-6.jar.sha1
@@ -0,0 +1 @@
+4e700aed4f9883d3e614a41377ecc713dd97307e
\ No newline at end of file
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070630.113158-6.pom b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070630.113158-6.pom
new file mode 100644
index 000000000..3587217e1
--- /dev/null
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070630.113158-6.pom
@@ -0,0 +1,61 @@
+
+
+ plexus
+ org.codehaus.plexus
+ 1.0.11
+ ../pom/pom.xml
+
+ 4.0.0
+ plexus-utils
+ Plexus Common Utilities
+ 1.4.3-SNAPSHOT
+ http://plexus.codehaus.org/plexus-utils
+
+
+
+ maven-compiler-plugin
+
+
+
+ 1.3
+
+
+
+ maven-surefire-plugin
+
+
+ true
+
+ org/codehaus/plexus/util/FileBasedTestCase.java
+ **/Test*.java
+
+
+
+ JAVA_HOME
+ ${JAVA_HOME}
+
+
+ M2_HOME
+ ${M2_HOME}
+
+
+
+
+
+
+
+ scm:svn:http://svn.codehaus.org/plexus/plexus-utils/trunk/
+ scm:svn:https://svn.codehaus.org/plexus/plexus-utils/trunk
+ http://fisheye.codehaus.org/browse/plexus/plexus-utils/trunk/
+
+
+
+
+ maven-javadoc-plugin
+
+
+ maven-jxr-plugin
+
+
+
+
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070630.113158-6.pom.sha1 b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070630.113158-6.pom.sha1
new file mode 100644
index 000000000..2cd9afc58
--- /dev/null
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070630.113158-6.pom.sha1
@@ -0,0 +1 @@
+730554bce63d59d4411f971397adee9ad2e63ce5
\ No newline at end of file
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070707.122114-7.jar b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070707.122114-7.jar
new file mode 100644
index 000000000..6e4cf2ae8
Binary files /dev/null and b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070707.122114-7.jar differ
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070707.122114-7.jar.sha1 b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070707.122114-7.jar.sha1
new file mode 100644
index 000000000..a083299fd
--- /dev/null
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070707.122114-7.jar.sha1
@@ -0,0 +1 @@
+7a78a6050e8c582fd5818c218c37532b9b3c23d1
\ No newline at end of file
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070707.122114-7.pom b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070707.122114-7.pom
new file mode 100644
index 000000000..3587217e1
--- /dev/null
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070707.122114-7.pom
@@ -0,0 +1,61 @@
+
+
+ plexus
+ org.codehaus.plexus
+ 1.0.11
+ ../pom/pom.xml
+
+ 4.0.0
+ plexus-utils
+ Plexus Common Utilities
+ 1.4.3-SNAPSHOT
+ http://plexus.codehaus.org/plexus-utils
+
+
+
+ maven-compiler-plugin
+
+
+
+ 1.3
+
+
+
+ maven-surefire-plugin
+
+
+ true
+
+ org/codehaus/plexus/util/FileBasedTestCase.java
+ **/Test*.java
+
+
+
+ JAVA_HOME
+ ${JAVA_HOME}
+
+
+ M2_HOME
+ ${M2_HOME}
+
+
+
+
+
+
+
+ scm:svn:http://svn.codehaus.org/plexus/plexus-utils/trunk/
+ scm:svn:https://svn.codehaus.org/plexus/plexus-utils/trunk
+ http://fisheye.codehaus.org/browse/plexus/plexus-utils/trunk/
+
+
+
+
+ maven-javadoc-plugin
+
+
+ maven-jxr-plugin
+
+
+
+
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070707.122114-7.pom.sha1 b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070707.122114-7.pom.sha1
new file mode 100644
index 000000000..2cd9afc58
--- /dev/null
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-20070707.122114-7.pom.sha1
@@ -0,0 +1 @@
+730554bce63d59d4411f971397adee9ad2e63ce5
\ No newline at end of file
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.jar b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.jar
new file mode 100644
index 000000000..6e4cf2ae8
Binary files /dev/null and b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.jar differ
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.pom b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.pom
new file mode 100644
index 000000000..3587217e1
--- /dev/null
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/test-repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.pom
@@ -0,0 +1,61 @@
+
+
+ plexus
+ org.codehaus.plexus
+ 1.0.11
+ ../pom/pom.xml
+
+ 4.0.0
+ plexus-utils
+ Plexus Common Utilities
+ 1.4.3-SNAPSHOT
+ http://plexus.codehaus.org/plexus-utils
+
+
+
+ maven-compiler-plugin
+
+
+
+ 1.3
+
+
+
+ maven-surefire-plugin
+
+
+ true
+
+ org/codehaus/plexus/util/FileBasedTestCase.java
+ **/Test*.java
+
+
+
+ JAVA_HOME
+ ${JAVA_HOME}
+
+
+ M2_HOME
+ ${M2_HOME}
+
+
+
+
+
+
+
+ scm:svn:http://svn.codehaus.org/plexus/plexus-utils/trunk/
+ scm:svn:https://svn.codehaus.org/plexus/plexus-utils/trunk
+ http://fisheye.codehaus.org/browse/plexus/plexus-utils/trunk/
+
+
+
+
+ maven-javadoc-plugin
+
+
+ maven-jxr-plugin
+
+
+
+