Changing repository content API

301 files changed, 379 insertions, 180 deletions

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/ValidatorTest.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/ValidatorTest.java
index e17e32f2e..2c23344e7 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/ValidatorTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/ValidatorTest.java
@@ -36,7 +36,7 @@ public  class ValidatorTest
     public void testGenericValidator() 
     {
         Pattern pattern = Pattern.compile( ManagedRepositoryAdmin.REPOSITORY_LOCATION_VALID_EXPRESSION );
-        // Checks only the pattern 
+        // Checks only the pattern
         assertFalse("A repo location cannot contains space",pattern.matcher( "/opt/ testme/" ).matches());
         
     }
diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/ManagedRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/ManagedRepositoryContent.java
index 5cabc3f6a..294804475 100644
--- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/ManagedRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/ManagedRepositoryContent.java
@@ -25,6 +25,7 @@ import org.apache.archiva.model.ProjectReference;
 import org.apache.archiva.model.VersionedReference;
 import org.apache.archiva.repository.storage.StorageAsset;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -37,6 +38,34 @@ public interface ManagedRepositoryContent extends RepositoryContent
 {
 
 
+    /**
+     * Returns the version reference for the given coordinates.
+     * @param groupId the group id
+     * @param artifactId the artifact id
+     * @param version the version number
+     * @return a version reference
+     */
+    VersionedReference toVersion( String groupId, String artifactId, String version );
+
+    /**
+     * Return the version reference the artifact is part of.
+     *
+     * @param artifactReference The artifact reference
+     * @return the version reference
+     */
+    VersionedReference toVersion( ArtifactReference artifactReference);
+
+    /**
+     * Returns a artifact reference for the given coordinates.
+     * @param groupId the group id
+     * @param artifactId the artifact id
+     * @param version the version
+     * @param type the type
+     * @param classifier the classifier
+     * @return a artifact reference object
+     */
+    ArtifactReference toArtifact( String groupId, String artifactId, String version, String type, String classifier);
+
 
     /**
      * Delete from the managed repository all files / directories associated with the
@@ -89,19 +118,41 @@ public interface ManagedRepositoryContent extends RepositoryContent
     /**
      * <p>
      * Gather up the list of related artifacts to the ArtifactReference provided.
-     * This typically inclues the pom files, and those things with
-     * classifiers (such as doc, source code, test libs, etc...)
+     * This typically includes the pom files, and those things with
+     * classifiers (such as doc, source code, test libs, etc...). Even if the classifier
+     * is set in the artifact reference, it may return artifacts with different classifiers.
      * </p>
      * <p>
      * <strong>NOTE:</strong> Some layouts (such as maven 1 "legacy") are not compatible with this query.
      * </p>
      *
      * @param reference the reference to work off of.
-     * @return the set of ArtifactReferences for related artifacts.
+     * @return the list of ArtifactReferences for related artifacts, if
      * @throws ContentNotFoundException if the initial artifact reference does not exist within the repository.
      */
-    Set<ArtifactReference> getRelatedArtifacts( ArtifactReference reference )
-        throws ContentNotFoundException;
+    List<ArtifactReference> getRelatedArtifacts( ArtifactReference reference )
+        throws ContentNotFoundException, LayoutException;
+
+    /**
+     * Returns all the assets that belong to a given artifact type. The list returned contain
+     * all the files that correspond to the given artifact reference.
+     * This method is the same as {@link #getRelatedArtifacts(ArtifactReference)} but may also return
+     * e.g. hash files.
+     *
+     * @param reference
+     * @return
+     */
+    List<StorageAsset> getRelatedAssets(ArtifactReference reference) throws ContentNotFoundException, LayoutException;
+
+    /**
+     * Returns all artifacts that belong to a given version
+     * @param reference the version reference
+     * @return the list of artifacts or a empty list
+     */
+    List<ArtifactReference> getArtifacts(VersionedReference reference) throws ContentNotFoundException, LayoutException;
+
+
+
 
     /**
      * <p>
@@ -135,6 +186,8 @@ public interface ManagedRepositoryContent extends RepositoryContent
     Set<String> getVersions( ProjectReference reference )
         throws ContentNotFoundException, LayoutException;
 
+
+
     /**
      * <p>
      * Given a specific {@link VersionedReference}, return the list of available versions for that
@@ -181,7 +234,7 @@ public interface ManagedRepositoryContent extends RepositoryContent
      *
      * @param repo the repository to associate with this repository content.
      */
-    void setRepository( org.apache.archiva.repository.ManagedRepository repo );
+    void setRepository( ManagedRepository repo );
 
     /**
      * Given an {@link ArtifactReference}, return the file reference to the artifact.
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java
index 27b1e1f45..3b42d2783 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java
@@ -31,6 +31,7 @@ import org.apache.archiva.repository.RepositoryException;
 import org.apache.archiva.repository.storage.StorageAsset;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -42,6 +43,24 @@ public class ManagedRepositoryContentMock implements ManagedRepositoryContent
     private ManagedRepository repository;
 
     @Override
+    public VersionedReference toVersion( String groupId, String artifactId, String version )
+    {
+        return null;
+    }
+
+    @Override
+    public VersionedReference toVersion( ArtifactReference artifactReference )
+    {
+        return null;
+    }
+
+    @Override
+    public ArtifactReference toArtifact( String groupId, String artifactId, String version, String type, String classifier )
+    {
+        return null;
+    }
+
+    @Override
     public void deleteVersion( VersionedReference reference ) throws ContentNotFoundException
     {
 
@@ -72,7 +91,19 @@ public class ManagedRepositoryContentMock implements ManagedRepositoryContent
     }
 
     @Override
-    public Set<ArtifactReference> getRelatedArtifacts( ArtifactReference reference ) throws ContentNotFoundException
+    public List<ArtifactReference> getRelatedArtifacts( ArtifactReference reference ) throws ContentNotFoundException, LayoutException
+    {
+        return null;
+    }
+
+    @Override
+    public List<StorageAsset> getRelatedAssets( ArtifactReference reference ) throws ContentNotFoundException, LayoutException
+    {
+        return null;
+    }
+
+    @Override
+    public List<ArtifactReference> getArtifacts( VersionedReference reference ) throws ContentNotFoundException, LayoutException
     {
         return null;
     }
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/mock/ManagedRepositoryContentMock.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/mock/ManagedRepositoryContentMock.java
index c44251457..6fec88e09 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/mock/ManagedRepositoryContentMock.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/mock/ManagedRepositoryContentMock.java
@@ -35,6 +35,7 @@ import org.apache.commons.lang3.StringUtils;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -58,6 +59,24 @@ public class ManagedRepositoryContentMock implements ManagedRepositoryContent
     }
 
     @Override
+    public VersionedReference toVersion( String groupId, String artifactId, String version )
+    {
+        return null;
+    }
+
+    @Override
+    public VersionedReference toVersion( ArtifactReference artifactReference )
+    {
+        return null;
+    }
+
+    @Override
+    public ArtifactReference toArtifact( String groupId, String artifactId, String version, String type, String classifier )
+    {
+        return null;
+    }
+
+    @Override
     public void deleteVersion( VersionedReference reference ) throws ContentNotFoundException
     {
 
@@ -88,7 +107,19 @@ public class ManagedRepositoryContentMock implements ManagedRepositoryContent
     }
 
     @Override
-    public Set<ArtifactReference> getRelatedArtifacts( ArtifactReference reference ) throws ContentNotFoundException
+    public List<ArtifactReference> getRelatedArtifacts( ArtifactReference reference ) throws ContentNotFoundException, LayoutException
+    {
+        return null;
+    }
+
+    @Override
+    public List<StorageAsset> getRelatedAssets( ArtifactReference reference ) throws ContentNotFoundException, LayoutException
+    {
+        return null;
+    }
+
+    @Override
+    public List<ArtifactReference> getArtifacts( VersionedReference reference ) throws ContentNotFoundException, LayoutException
     {
         return null;
     }
diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java
index 0448b2fb4..3aba949b2 100644
--- a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java
+++ b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java
@@ -37,6 +37,7 @@ import org.springframework.stereotype.Service;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -62,6 +63,24 @@ public class ManagedRepositoryContentMock implements ManagedRepositoryContent
     }
 
     @Override
+    public VersionedReference toVersion( String groupId, String artifactId, String version )
+    {
+        return null;
+    }
+
+    @Override
+    public VersionedReference toVersion( ArtifactReference artifactReference )
+    {
+        return null;
+    }
+
+    @Override
+    public ArtifactReference toArtifact( String groupId, String artifactId, String version, String type, String classifier )
+    {
+        return null;
+    }
+
+    @Override
     public void deleteVersion( VersionedReference reference ) throws ContentNotFoundException
     {
 
@@ -92,7 +111,19 @@ public class ManagedRepositoryContentMock implements ManagedRepositoryContent
     }
 
     @Override
-    public Set<ArtifactReference> getRelatedArtifacts( ArtifactReference reference ) throws ContentNotFoundException
+    public List<ArtifactReference> getRelatedArtifacts( ArtifactReference reference ) throws ContentNotFoundException, LayoutException
+    {
+        return null;
+    }
+
+    @Override
+    public List<StorageAsset> getRelatedAssets( ArtifactReference reference ) throws ContentNotFoundException, LayoutException
+    {
+        return null;
+    }
+
+    @Override
+    public List<ArtifactReference> getArtifacts( VersionedReference reference ) throws ContentNotFoundException, LayoutException
     {
         return null;
     }
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
index 8d86b375d..4f1ceb6e6 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
@@ -376,6 +376,7 @@
               <exclude>src/test/resources/test01.properties</exclude>
               <exclude>src/test/resources/target-repo/**</exclude>
               <exclude>src/test/resources/test-repository-with-conflict-artifacts/**</exclude>
+              <exclude>src/test/resources/repositories/**</exclude>
             </excludes>
           </configuration>
         </plugin>
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java
index a8103441e..d7d87c8b3 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java
@@ -79,14 +79,37 @@ public abstract class AbstractDefaultRepositoryContent implements RepositoryCont
         return defaultPathParser.toArtifactReference( path );
     }
 
+    public String toPath (ProjectReference reference) {
+        final StringBuilder path = new StringBuilder();
+        path.append( formatAsDirectory( reference.getGroupId() ) ).append( PATH_SEPARATOR );
+        path.append( reference.getArtifactId( ) );
+        return path.toString( );
+    }
+
     public String toMetadataPath( ProjectReference reference )
     {
-        StringBuilder path = new StringBuilder();
-
+        final StringBuilder path = new StringBuilder();
         path.append( formatAsDirectory( reference.getGroupId() ) ).append( PATH_SEPARATOR );
         path.append( reference.getArtifactId() ).append( PATH_SEPARATOR );
         path.append( MAVEN_METADATA );
+        return path.toString();
+    }
 
+    public String toPath( String namespace )
+    {
+        return formatAsDirectory( namespace );
+    }
+
+    public String toPath( VersionedReference reference )
+    {
+        final StringBuilder path = new StringBuilder();
+        path.append( formatAsDirectory( reference.getGroupId() ) ).append( PATH_SEPARATOR );
+        path.append( reference.getArtifactId() ).append( PATH_SEPARATOR );
+        if ( reference.getVersion() != null )
+        {
+            // add the version only if it is present
+            path.append( VersionUtil.getBaseVersion( reference.getVersion() ) );
+        }
         return path.toString();
     }
 
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java
index 9b39137e3..6336d0ae8 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java
@@ -21,6 +21,7 @@ package org.apache.archiva.repository.content.maven2;
 
 import org.apache.archiva.common.filelock.FileLockManager;
 import org.apache.archiva.common.utils.PathUtil;
+import org.apache.archiva.common.utils.VersionUtil;
 import org.apache.archiva.configuration.FileTypes;
 import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider;
 import org.apache.archiva.metadata.repository.storage.maven2.DefaultArtifactMappingProvider;
@@ -66,8 +67,6 @@ public class ManagedDefaultRepositoryContent
 
     private ManagedRepository repository;
 
-    private Path repoDir;
-
     FileLockManager lockManager;
 
     public ManagedDefaultRepositoryContent(ManagedRepository repository, FileTypes fileTypes, FileLockManager lockManager) {
@@ -86,18 +85,47 @@ public class ManagedDefaultRepositoryContent
 
     }
 
-    private Path getRepoDir() {
-        return repoDir;
+    /**
+     * Returns a version reference from the coordinates
+     * @param groupId the group id
+     * @param artifactId the artifact id
+     * @param version the version
+     * @return the versioned reference object
+     */
+    @Override
+    public VersionedReference toVersion( String groupId, String artifactId, String version ) {
+        VersionedReference ref = new VersionedReference();
+        ref.setGroupId(groupId);
+        ref.setArtifactId(artifactId);
+        ref.setVersion(version);
+        return ref;
+    }
+
+    /**
+     * Return the version the artifact is part of
+     * @param artifactReference
+     * @return
+     */
+    public VersionedReference toVersion( ArtifactReference artifactReference) {
+        return toVersion( artifactReference.getGroupId( ), artifactReference.getArtifactId( ), VersionUtil.getBaseVersion( artifactReference.getVersion( ) ));
+    }
+
+    @Override
+    public ArtifactReference toArtifact( String groupId, String artifactId, String version, String type, String classifier) {
+        ArtifactReference ar = new ArtifactReference( );
+        ar.setGroupId( groupId );
+        ar.setArtifactId( artifactId );
+        ar.setVersion( version );
+        ar.setType( type );
+        ar.setClassifier( classifier );
+        return ar;
     }
 
 
     @Override
     public void deleteVersion( VersionedReference reference )
     {
-        String path = toMetadataPath( reference );
-        Path projectPath = Paths.get( getRepoRoot(), path );
-
-        Path projectDir = projectPath.getParent();
+        Path projectDir = getRepoDir().resolve(toPath(reference));
         if ( Files.exists(projectDir) && Files.isDirectory(projectDir) )
         {
             org.apache.archiva.common.utils.FileUtils.deleteQuietly( projectDir );
@@ -108,20 +136,19 @@ public class ManagedDefaultRepositoryContent
     public void deleteProject( String namespace, String projectId )
         throws RepositoryException
     {
-        ArtifactReference artifactReference = new ArtifactReference();
-        artifactReference.setGroupId( namespace );
-        artifactReference.setArtifactId( projectId );
-        String path = toPath( artifactReference );
-        Path directory = Paths.get( getRepoRoot(), path );
-        if ( !Files.exists(directory) )
+        ProjectReference ref = new ProjectReference( );
+        ref.setGroupId( namespace );
+        ref.setArtifactId( projectId );
+        Path projDirectory = getRepoDir( ).resolve( toPath(ref) );
+        if ( !Files.exists(projDirectory) )
         {
             throw new ContentNotFoundException( "cannot found project " + namespace + ":" + projectId );
         }
-        if ( Files.isDirectory(directory) )
+        if ( Files.isDirectory(projDirectory) )
         {
             try
             {
-                org.apache.archiva.common.utils.FileUtils.deleteDirectory( directory );
+                org.apache.archiva.common.utils.FileUtils.deleteDirectory( projDirectory );
             }
             catch ( IOException e )
             {
@@ -138,22 +165,22 @@ public class ManagedDefaultRepositoryContent
     @Override
     public void deleteArtifact( ArtifactReference artifactReference )
     {
-        String path = toPath( artifactReference );
-        Path filePath = Paths.get( getRepoRoot(), path );
-
+        final Path repoDir = getRepoDir( );
+        Path filePath = repoDir.resolve( toPath( artifactReference ) );
+        Path parentPath = filePath.getParent( );
         if ( Files.exists(filePath) )
         {
             org.apache.archiva.common.utils.FileUtils.deleteQuietly( filePath );
         }
 
-        Path filePathmd5 = Paths.get( getRepoRoot(), path + ".md5" );
+        Path filePathmd5 = parentPath.resolve( filePath.getFileName().toString()+".md5" );
 
         if ( Files.exists(filePathmd5) )
         {
             org.apache.archiva.common.utils.FileUtils.deleteQuietly( filePathmd5 );
         }
 
-        Path filePathsha1 = Paths.get( getRepoRoot(), path + ".sha1" );
+        Path filePathsha1 = parentPath.resolve( filePath.getFileName().toString()+ ".sha1" );
 
         if ( Files.exists(filePathsha1) )
         {
@@ -165,11 +192,7 @@ public class ManagedDefaultRepositoryContent
     public void deleteGroupId( String groupId )
         throws ContentNotFoundException
     {
-
-        String path = StringUtils.replaceChars( groupId, '.', '/' );
-
-        Path directory = Paths.get( getRepoRoot(), path );
-
+        Path directory = getRepoDir( ).resolve( toPath( groupId ) );
         if ( Files.exists(directory) )
         {
             try
@@ -190,11 +213,10 @@ public class ManagedDefaultRepositoryContent
     }
 
     @Override
-    public Set<ArtifactReference> getRelatedArtifacts( ArtifactReference reference )
-        throws ContentNotFoundException
+    public List<ArtifactReference> getRelatedArtifacts( ArtifactReference reference )
+        throws ContentNotFoundException, LayoutException
     {
         StorageAsset artifactFile = toFile( reference );
-        StorageAsset repoBase = repository.getAsset( "" );
         StorageAsset repoDir = artifactFile.getParent();
 
         if ( !repoDir.exists())
@@ -209,12 +231,10 @@ public class ManagedDefaultRepositoryContent
                 "Unable to get related artifacts using a non-directory: " + repoDir.getPath() );
         }
 
-        Set<ArtifactReference> foundArtifacts;
-
         // First gather up the versions found as artifacts in the managed repository.
 
         try (Stream<StorageAsset> stream = repoDir.list().stream() ) {
-            foundArtifacts = stream.filter(asset -> !asset.isContainer()).map(path -> {
+            return stream.filter(asset -> !asset.isContainer()).map(path -> {
                 try {
                     ArtifactReference artifact = toArtifactReference(path.getPath());
                     if( artifact.getGroupId().equals( reference.getGroupId() ) && artifact.getArtifactId().equals(
@@ -227,9 +247,14 @@ public class ManagedDefaultRepositoryContent
                     log.debug( "Not processing file that is not an artifact: {}", e.getMessage() );
                     return null;
                 }
-            }).filter(Objects::nonNull).collect(Collectors.toSet());
+            }).filter(Objects::nonNull).collect(Collectors.toList());
         }
-        return foundArtifacts;
+    }
+
+    @Override
+    public List<StorageAsset> getRelatedAssets( ArtifactReference reference ) throws ContentNotFoundException, LayoutException
+    {
+        return null;
     }
 
     @Override
@@ -249,7 +274,7 @@ public class ManagedDefaultRepositoryContent
     }
 
     @Override
-    public org.apache.archiva.repository.ManagedRepository getRepository()
+    public ManagedRepository getRepository()
     {
         return repository;
     }
@@ -265,103 +290,56 @@ public class ManagedDefaultRepositoryContent
     public Set<String> getVersions( ProjectReference reference )
         throws ContentNotFoundException, LayoutException
     {
-        String path = toMetadataPath( reference );
-
-        int idx = path.lastIndexOf( '/' );
-        if ( idx > 0 )
-        {
-            path = path.substring( 0, idx );
-        }
-
-        Path repoDir = PathUtil.getPathFromUri( repository.getLocation() ).resolve( path );
-
-        if ( !Files.exists(repoDir) )
+        final Path projDir = getRepoDir().resolve(toPath(reference));
+        if ( !Files.exists(projDir) )
         {
             throw new ContentNotFoundException(
-                "Unable to get Versions on a non-existant directory: " + repoDir.toAbsolutePath() );
+                "Unable to get Versions on a non-existant directory: " + projDir.toAbsolutePath() );
         }
 
-        if ( !Files.isDirectory(repoDir) )
+        if ( !Files.isDirectory(projDir) )
         {
             throw new ContentNotFoundException(
-                "Unable to get Versions on a non-directory: " + repoDir.toAbsolutePath() );
+                "Unable to get Versions on a non-directory: " + projDir.toAbsolutePath() );
         }
 
         final String groupId = reference.getGroupId();
         final String artifactId = reference.getArtifactId();
-        try(Stream<Path> stream = Files.list(repoDir)) {
+        try(Stream<Path> stream = Files.list(projDir)) {
             return stream.filter(Files::isDirectory).map(
-                    p -> newVersionedRef(groupId, artifactId, p.getFileName().toString())
+                    p -> toVersion(groupId, artifactId, p.getFileName().toString())
             ).filter(this::hasArtifact).map(ref -> ref.getVersion())
                     .collect(Collectors.toSet());
         } catch (IOException e) {
-            log.error("Could not read directory {}: {}", repoDir, e.getMessage(), e);
+            log.error("Could not read directory {}: {}", projDir, e.getMessage(), e);
         } catch (RuntimeException e) {
-            if (e.getCause()!=null && e.getCause() instanceof LayoutException) {
-                throw (LayoutException)e.getCause();
-            } else {
+            if (e.getCause()!=null)
+            {
+                if ( e.getCause( ) instanceof LayoutException )
+                {
+                    throw (LayoutException) e.getCause( );
+                }
+            }else {
                 throw e;
             }
         }
         return Collections.emptySet();
     }
 
-    static final VersionedReference newVersionedRef(final String groupId, final String artifactId, final String version) {
-        VersionedReference ref = new VersionedReference();
-        ref.setGroupId(groupId);
-        ref.setArtifactId(artifactId);
-        ref.setVersion(version);
-        return ref;
-    }
-
     @Override
     public Set<String> getVersions( VersionedReference reference )
         throws ContentNotFoundException
     {
-        String path = toMetadataPath( reference );
-
-        int idx = path.lastIndexOf( '/' );
-        if ( idx > 0 )
+        try(Stream<ArtifactReference> stream = getArtifactStream( reference ))
         {
-            path = path.substring( 0, idx );
+            return stream.filter( Objects::nonNull )
+                .map( ar -> ar.getVersion( ) )
+                .collect( Collectors.toSet( ) );
         }
-
-        Path repoBase = PathUtil.getPathFromUri(repository.getLocation());
-        Path repoDir = repoBase.resolve( path );
-
-        if ( !Files.exists(repoDir) )
+        catch ( LayoutException | IOException e )
         {
-            throw new ContentNotFoundException(
-                "Unable to get versions on a non-existant directory: " + repoDir.toAbsolutePath() );
+            throw new ContentNotFoundException( e.getMessage( ), e );
         }
-
-        if ( !Files.isDirectory(repoDir) )
-        {
-            throw new ContentNotFoundException(
-                "Unable to get versions on a non-directory: " + repoDir.toAbsolutePath() );
-        }
-
-        Set<String> foundVersions = new HashSet<>();
-
-        try(Stream<Path> stream = Files.list(repoDir)) {
-            return stream.filter(Files::isRegularFile)
-                    .map(p -> repoBase.relativize(p).toString())
-                    .filter(p -> !filetypes.matchesDefaultExclusions(p))
-                    .filter(filetypes::matchesArtifactPattern)
-                    .map(path1 -> {
-                        try {
-                            return toArtifactReference(path1);
-                        } catch (LayoutException e) {
-                            log.debug( "Not processing file that is not an artifact: {}", e.getMessage() );
-                            return null;
-                        }
-                    }).filter(Objects::nonNull)
-                    .map(ar -> ar.getVersion())
-                    .collect(Collectors.toSet());
-        } catch (IOException e) {
-            log.error("Could not read directory {}: {}", repoDir, e.getMessage(), e);
-        }
-        return Collections.emptySet();
     }
 
     @Override
@@ -392,23 +370,25 @@ public class ManagedDefaultRepositoryContent
         {
             return ( getFirstArtifact( reference ) != null );
         }
-        catch ( IOException | LayoutException e )
+        catch ( IOException | LayoutException | ContentNotFoundException e )
         {
             return false;
         }
     }
 
     @Override
-    public void setRepository( ManagedRepository repo )
+    public void setRepository( final ManagedRepository repo )
     {
         this.repository = repo;
         if (repo!=null) {
-            this.repoDir = PathUtil.getPathFromUri(repository.getLocation());
             if (repository instanceof EditableManagedRepository) {
                 ((EditableManagedRepository) repository).setContent(this);
             }
         }
+    }
 
+    private Path getRepoDir() {
+        return repository.getAsset( "" ).getFilePath( );
     }
 
     /**
@@ -469,56 +449,59 @@ public class ManagedDefaultRepositoryContent
      * @throws LayoutException
      */
     private ArtifactReference getFirstArtifact( VersionedReference reference )
-        throws LayoutException, IOException
+        throws ContentNotFoundException, LayoutException, IOException
     {
-        String path = toMetadataPath( reference );
-
-        int idx = path.lastIndexOf( '/' );
-        if ( idx > 0 )
+        try(Stream<ArtifactReference> stream = getArtifactStream( reference ))
         {
-            path = path.substring( 0, idx );
+            return stream.findFirst( ).orElse( null );
+        } catch (RuntimeException e) {
+            throw new ContentNotFoundException( e.getMessage( ), e.getCause( ) );
         }
+    }
 
-        Path repoBase = PathUtil.getPathFromUri(repository.getLocation()).toAbsolutePath();
-        Path repoDir = repoBase.resolve( path );
-
-        if ( !Files.exists(repoDir) )
+    private Stream<ArtifactReference> getArtifactStream(VersionedReference reference) throws ContentNotFoundException, LayoutException, IOException {
+        final Path repoBase = getRepoDir( );
+        String path = toMetadataPath( reference );
+        Path versionDir = repoBase.resolve( path ).getParent();
+        if ( !Files.exists(versionDir) )
         {
-            throw new IOException( "Unable to gather the list of snapshot versions on a non-existant directory: "
-                                       + repoDir.toAbsolutePath() );
+            throw new ContentNotFoundException( "Unable to gather the list of artifacts on a non-existant directory: "
+                + versionDir.toAbsolutePath() );
         }
 
-        if ( !Files.isDirectory(repoDir) )
+        if ( !Files.isDirectory(versionDir) )
         {
-            throw new IOException(
-                "Unable to gather the list of snapshot versions on a non-directory: " + repoDir.toAbsolutePath() );
+            throw new ContentNotFoundException(
+                "Unable to gather the list of snapshot versions on a non-directory: " + versionDir.toAbsolutePath() );
         }
-        try(Stream<Path> stream = Files.list(repoDir)) {
-            return stream.filter(Files::isRegularFile)
+        return Files.list(versionDir).filter(Files::isRegularFile)
                 .map(p -> repoBase.relativize(p).toString())
-                    .filter(filetypes::matchesArtifactPattern)
-                    .map(this::toArtifactRef).findFirst().orElse(null);
-        } catch (RuntimeException e) {
-            if (e.getCause()!=null && e.getCause() instanceof LayoutException) {
-                throw (LayoutException)e.getCause();
-            } else {
-                throw e;
-            }
-        }
+                .filter(p -> !filetypes.matchesDefaultExclusions(p))
+                .filter(filetypes::matchesArtifactPattern)
+                .map(this::toArtifactRef);
+    }
 
+    public List<ArtifactReference> getArtifacts(VersionedReference reference) throws ContentNotFoundException, LayoutException
+    {
+        try (Stream<ArtifactReference> stream = getArtifactStream( reference ))
+        {
+            return stream.collect( Collectors.toList( ) );
+        } catch ( IOException e )
+        {
+            log.error( "Could not access the repository files: ", e.getMessage( ), e );
+            throw new ContentNotFoundException( e.getMessage( ), e );
+        }
     }
 
     private boolean hasArtifact( VersionedReference reference )
 
     {
-        try
-        {
-            return ( getFirstArtifact( reference ) != null );
-        }
-        catch ( IOException e )
+        try(Stream<ArtifactReference> stream = getArtifactStream( reference ))
         {
+            return stream.anyMatch( e -> true );
+        } catch (ContentNotFoundException e) {
             return false;
-        } catch (LayoutException e) {
+        } catch ( LayoutException | IOException e) {
             // We throw the runtime exception for better stream handling
             throw new RuntimeException(e);
         }
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java
index 6b448a1c9..0e1a1cecb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java
@@ -36,6 +36,7 @@ import org.junit.Test;
 
 import javax.inject.Inject;
 import javax.inject.Named;
+import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -68,11 +69,22 @@ public class ManagedDefaultRepositoryContentTest
     @Inject
     FileLockManager fileLockManager;
 
+    private Path getRepositoryPath(String repoName) {
+        try
+        {
+            return Paths.get( Thread.currentThread( ).getContextClassLoader( ).getResource( "repositories/" + repoName ).toURI( ) );
+        }
+        catch ( URISyntaxException e )
+        {
+            throw new RuntimeException( "Could not resolve repository path " + e.getMessage( ), e );
+        }
+    }
+
     @Before
     public void setUp()
         throws Exception
     {
-        Path repoDir = Paths.get( "src/test/repositories/default-repository" );
+        Path repoDir = getRepositoryPath( "default-repository" );
 
         MavenManagedRepository repository = createRepository( "testRepo", "Unit Test Repo", repoDir );
 
@@ -90,7 +102,7 @@ public class ManagedDefaultRepositoryContentTest
     public void testGetVersionsBadArtifact()
         throws Exception
     {
-        assertGetVersions( "bad_artifact", Collections.<String>emptyList() );
+        assertGetVersions( "bad_artifact", Collections.emptyList() );
     }
 
     @Test
@@ -185,7 +197,7 @@ public class ManagedDefaultRepositoryContentTest
 
         // Use the test metadata-repository, which is already setup for
         // These kind of version tests.
-        Path repoDir = Paths.get( "src/test/repositories/metadata-repository" );
+        Path repoDir = getRepositoryPath( "metadata-repository" );
         (( EditableManagedRepository)repoContent.getRepository()).setLocation( repoDir.toAbsolutePath().toUri() );
 
         // Request the versions.
@@ -210,7 +222,7 @@ public class ManagedDefaultRepositoryContentTest
 
         // Use the test metadata-repository, which is already setup for
         // These kind of version tests.
-        Path repoDir = Paths.get( "src/test/repositories/metadata-repository" );
+        Path repoDir = getRepositoryPath( "metadata-repository" );
         ((EditableManagedRepository)repoContent.getRepository()).setLocation( repoDir.toAbsolutePath().toUri() );
 
         // Request the versions.
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/content/maven2/MavenRepositoryRequestInfoTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/content/maven2/MavenRepositoryRequestInfoTest.java
index 1c7c03e3a..eb183343b 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/content/maven2/MavenRepositoryRequestInfoTest.java
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/content/maven2/MavenRepositoryRequestInfoTest.java
@@ -41,6 +41,7 @@ import org.springframework.test.context.ContextConfiguration;
 import javax.inject.Inject;
 import javax.inject.Named;
 import java.io.IOException;
+import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
@@ -81,13 +82,23 @@ public class MavenRepositoryRequestInfoTest
         return repo;
     }
 
+    private Path getRepositoryPath(String repoName) {
+        try
+        {
+            return Paths.get( Thread.currentThread( ).getContextClassLoader( ).getResource( "repositories/" + repoName ).toURI( ) );
+        }
+        catch ( URISyntaxException e )
+        {
+            throw new RuntimeException( "Could not resolve repository path " + e.getMessage( ), e );
+        }
+    }
 
     @Before
     public void setUp()
         throws Exception
     {
 
-        Path repoDir = Paths.get( "src/test/repositories/default-repository" );
+        Path repoDir = getRepositoryPath( "default-repository" );
         MavenManagedRepository repository = createRepository( "testRepo", "Unit Test Repo", repoDir );
 
         FileType fileType = archivaConfiguration.getConfiguration().getRepositoryScanning().getFileTypes().get( 0 );
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java
index b9b09db20..2a85b8348 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java
@@ -48,6 +48,7 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.IOException;
+import java.net.URISyntaxException;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -76,6 +77,17 @@ public class MetadataToolsTest
     @Named ( "archivaConfiguration#mock" )
     protected MockConfiguration config;
 
+    private Path getRepositoryPath(String repoName) {
+        try
+        {
+            return Paths.get( Thread.currentThread( ).getContextClassLoader( ).getResource( "repositories/" + repoName ).toURI( ) );
+        }
+        catch ( URISyntaxException e )
+        {
+            throw new RuntimeException( "Could not resolve repository path " + e.getMessage( ), e );
+        }
+    }
+
     @Test
     public void testGatherSnapshotVersionsA()
         throws Exception
@@ -359,7 +371,7 @@ public class MetadataToolsTest
     private void assertSnapshotVersions( String artifactId, String version, String[] expectedVersions )
         throws Exception
     {
-        Path repoRootDir = Paths.get( "src/test/repositories/metadata-repository" );
+        Path repoRootDir = getRepositoryPath( "metadata-repository" );
 
         VersionedReference reference = new VersionedReference();
         reference.setGroupId( "org.apache.archiva.metadata.tests" );
@@ -642,7 +654,7 @@ public class MetadataToolsTest
         String groupDir = StringUtils.replaceChars( reference.getGroupId(), '.', '/' );
         String path = groupDir + "/" + reference.getArtifactId();
 
-        Path srcRepoDir = Paths.get( "src/test/repositories/metadata-repository" );
+        Path srcRepoDir = getRepositoryPath( "metadata-repository" );
         Path srcDir = srcRepoDir.resolve( path );
         Path destDir = Paths.get( repo.getRepoRoot(), path );
 
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataReaderTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataReaderTest.java
index 634d13d43..e5a03ca4e 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataReaderTest.java
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataReaderTest.java
@@ -26,6 +26,7 @@ import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
@@ -38,11 +39,23 @@ import java.nio.file.Paths;
 public class RepositoryMetadataReaderTest
     extends TestCase
 {
+
+    private Path getRepositoryPath(String repoName) {
+        try
+        {
+            return Paths.get( Thread.currentThread( ).getContextClassLoader( ).getResource( "repositories/" + repoName ).toURI( ) );
+        }
+        catch ( URISyntaxException e )
+        {
+            throw new RuntimeException( "Could not resolve repository path " + e.getMessage( ), e );
+        }
+    }
+
     @Test
     public void testLoadSimple()
         throws RepositoryMetadataException
     {
-        Path defaultRepoDir = Paths.get( "src/test/repositories/default-repository" );
+        Path defaultRepoDir = getRepositoryPath( "default-repository" );
         Path metadataFile = defaultRepoDir.resolve( "org/apache/maven/shared/maven-downloader/maven-metadata.xml" );
 
         MavenMetadataReader metadataReader = new MavenMetadataReader( );
@@ -62,7 +75,7 @@ public class RepositoryMetadataReaderTest
     public void testLoadComplex()
         throws RepositoryMetadataException
     {
-        Path defaultRepoDir = Paths.get( "src/test/repositories/default-repository" );
+        Path defaultRepoDir = getRepositoryPath( "default-repository" );
         Path metadataFile = defaultRepoDir.resolve( "org/apache/maven/samplejar/maven-metadata.xml" );
         MavenMetadataReader metadataReader = new MavenMetadataReader( );
 
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriterTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriterTest.java
index 55936edd3..3e41b14bf 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriterTest.java
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriterTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.io.StringWriter;
+import java.net.URISyntaxException;
 import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -40,12 +41,22 @@ import org.xmlunit.assertj.XmlAssert;
 public class RepositoryMetadataWriterTest
     extends TestCase
 {
+    private Path getRepositoryPath(String repoName) {
+        try
+        {
+            return Paths.get( Thread.currentThread( ).getContextClassLoader( ).getResource( "repositories/" + repoName ).toURI( ) );
+        }
+        catch ( URISyntaxException e )
+        {
+            throw new RuntimeException( "Could not resolve repository path " + e.getMessage( ), e );
+        }
+    }
 
     @Test
     public void testWriteSimple()
         throws Exception
     {
-        Path defaultRepoDir = Paths.get( "src/test/repositories/default-repository" );
+        Path defaultRepoDir = getRepositoryPath( "default-repository" );
         Path expectedFile = defaultRepoDir.resolve( "org/apache/maven/shared/maven-downloader/maven-metadata.xml" );
         String expectedContent = org.apache.archiva.common.utils.FileUtils.readFileToString( expectedFile, Charset.defaultCharset() );
 
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/CVS/Root b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/CVS/Root
deleted file mode 100644
index 2e65f24a6..000000000
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-not a real CVS root - for testing exclusions
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/KEYS b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/KEYS
index d3b34d5ad..d3b34d5ad 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/KEYS
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/KEYS
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/invalid/invalid-1.0.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid-1.0.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/invalid/invalid-1.0.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-1.0b.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/invalid/invalid/1.0/invalid-1.0b.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-1.0b.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/invalid/invalid/1.0/invalid-1.0b.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-2.0.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/invalid/invalid/1.0/invalid-2.0.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-2.0.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/invalid/invalid/1.0/invalid-2.0.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid/1/invalid-1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/invalid/invalid/1/invalid-1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/invalid/invalid/1/invalid-1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/invalid/invalid/1/invalid-1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/javax/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/javax/maven-metadata.xml
index b3baf545d..b3baf545d 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/javax/maven-metadata.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/javax/maven-metadata.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/javax/sql/jdbc/2.0/jdbc-2.0.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/javax/sql/jdbc/2.0/jdbc-2.0.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/javax/sql/jdbc/2.0/jdbc-2.0.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/javax/sql/jdbc/2.0/jdbc-2.0.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml
index caf5b6697..caf5b6697 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/javax/sql/jdbc/maven-metadata-repository.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/javax/sql/jdbc/maven-metadata-repository.xml
index bb7570891..bb7570891 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/javax/sql/jdbc/maven-metadata-repository.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/javax/sql/jdbc/maven-metadata-repository.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/javax/sql/maven-metadata-repository.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/javax/sql/maven-metadata-repository.xml
index caf5b6697..caf5b6697 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/javax/sql/maven-metadata-repository.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/javax/sql/maven-metadata-repository.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/archiva/sample-parent/2.1-SNAPSHOT/sample-parent-2.1-20090807.095532-1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/archiva/sample-parent/2.1-SNAPSHOT/sample-parent-2.1-20090807.095532-1.pom
index 55fdf5d28..55fdf5d28 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/archiva/sample-parent/2.1-SNAPSHOT/sample-parent-2.1-20090807.095532-1.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/archiva/sample-parent/2.1-SNAPSHOT/sample-parent-2.1-20090807.095532-1.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/archiva/sample-parent/2.1-SNAPSHOT/sample-parent-2.1-20090808.085535-2.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/archiva/sample-parent/2.1-SNAPSHOT/sample-parent-2.1-20090808.085535-2.pom
index ffc575bbc..ffc575bbc 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/archiva/sample-parent/2.1-SNAPSHOT/sample-parent-2.1-20090808.085535-2.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/archiva/sample-parent/2.1-SNAPSHOT/sample-parent-2.1-20090808.085535-2.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/archiva/sample-project/2.1-SNAPSHOT/sample-project-2.1-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/archiva/sample-project/2.1-SNAPSHOT/sample-project-2.1-SNAPSHOT.pom
index b9e7e38a1..b9e7e38a1 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/archiva/sample-project/2.1-SNAPSHOT/sample-project-2.1-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/archiva/sample-project/2.1-SNAPSHOT/sample-project-2.1-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom
index 372560004..372560004 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom.md5
index 7e4a5cfdd..7e4a5cfdd 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom.sha1
index b0a35015d..b0a35015d 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.210059-1.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom
index 372560004..372560004 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom.md5
index 7e4a5cfdd..7e4a5cfdd 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom.sha1
index b0a35015d..b0a35015d 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070725.232304-2.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom
index 372560004..372560004 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom.md5
index 7e4a5cfdd..7e4a5cfdd 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom.sha1
index b0a35015d..b0a35015d 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.053327-3.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom
index 372560004..372560004 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom.md5
index 7e4a5cfdd..7e4a5cfdd 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom.sha1
index b0a35015d..b0a35015d 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070726.173653-5.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom
index 372560004..372560004 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom.md5
index 7e4a5cfdd..7e4a5cfdd 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom.sha1
index b0a35015d..b0a35015d 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070727.113106-7.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom
index 372560004..372560004 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom.md5
index 7e4a5cfdd..7e4a5cfdd 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom.sha1
index b0a35015d..b0a35015d 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.053229-10.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom
index 372560004..372560004 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom.md5
index 7e4a5cfdd..7e4a5cfdd 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom.sha1
index b0a35015d..b0a35015d 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070728.112043-11.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom
index 372560004..372560004 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom.md5
index 7e4a5cfdd..7e4a5cfdd 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom.sha1
index b0a35015d..b0a35015d 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070729.171937-16.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom
index 372560004..372560004 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom.md5
index 7e4a5cfdd..7e4a5cfdd 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom.sha1
index b0a35015d..b0a35015d 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070730.232112-20.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom
index 8d5931c0e..8d5931c0e 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom.md5
index 9cebfeecc..9cebfeecc 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom.sha1
index 45d7111f6..45d7111f6 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.113304-21.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom
index 8d5931c0e..8d5931c0e 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom.md5
index 9cebfeecc..9cebfeecc 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom.sha1
index 45d7111f6..45d7111f6 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070731.172936-22.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom
index 8d5931c0e..8d5931c0e 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom.md5
index 9cebfeecc..9cebfeecc 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom.sha1
index 45d7111f6..45d7111f6 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/axis2-1.3-20070802.113139-29.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml
index 3d2b170fc..3d2b170fc 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml.md5
index f39e1f745..f39e1f745 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml.sha1
index ebf6c8ce2..ebf6c8ce2 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/axis2/axis2/1.3-SNAPSHOT/maven-metadata.xml.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/cocoon/cocoon/1/cocoon-1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/cocoon/cocoon/1/cocoon-1.pom
index 81201451e..81201451e 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/cocoon/cocoon/1/cocoon-1.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/cocoon/cocoon/1/cocoon-1.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.pom
index 202a0a448..202a0a448 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.war b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.war
index 54d190b23..54d190b23 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.war
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.war
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/B/1.0/B-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/B/1.0/B-1.0.pom
index fa5f8f6c8..fa5f8f6c8 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/B/1.0/B-1.0.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/B/1.0/B-1.0.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/B/2.0/B-2.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/B/2.0/B-2.0.pom
index c3034e820..c3034e820 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/B/2.0/B-2.0.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/B/2.0/B-2.0.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.pom
index ae14cd7eb..ae14cd7eb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.war b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.war
index 54d190b23..54d190b23 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.war
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.war
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-applet/1.0-SNAPSHOT/archiva-applet-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-applet/1.0-SNAPSHOT/archiva-applet-1.0-SNAPSHOT.pom
index d48ebf7a8..d48ebf7a8 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-applet/1.0-SNAPSHOT/archiva-applet-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-applet/1.0-SNAPSHOT/archiva-applet-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-base/1.0-SNAPSHOT/archiva-base-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-base/1.0-SNAPSHOT/archiva-base-1.0-SNAPSHOT.pom
index cd51f1edc..cd51f1edc 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-base/1.0-SNAPSHOT/archiva-base-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-base/1.0-SNAPSHOT/archiva-base-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-cli/1.0-SNAPSHOT/archiva-cli-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-cli/1.0-SNAPSHOT/archiva-cli-1.0-SNAPSHOT.pom
index 3041a9f8d..3041a9f8d 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-cli/1.0-SNAPSHOT/archiva-cli-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-cli/1.0-SNAPSHOT/archiva-cli-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-common/1.0-SNAPSHOT/archiva-common-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-common/1.0-SNAPSHOT/archiva-common-1.0-SNAPSHOT.pom
index 17a20abd5..17a20abd5 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-common/1.0-SNAPSHOT/archiva-common-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-common/1.0-SNAPSHOT/archiva-common-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-configuration/1.0-SNAPSHOT/archiva-configuration-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-configuration/1.0-SNAPSHOT/archiva-configuration-1.0-SNAPSHOT.pom
index 790d0cfa4..790d0cfa4 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-configuration/1.0-SNAPSHOT/archiva-configuration-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-configuration/1.0-SNAPSHOT/archiva-configuration-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-consumer-api/1.0-SNAPSHOT/archiva-consumer-api-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-consumer-api/1.0-SNAPSHOT/archiva-consumer-api-1.0-SNAPSHOT.pom
index f331ed074..f331ed074 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-consumer-api/1.0-SNAPSHOT/archiva-consumer-api-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-consumer-api/1.0-SNAPSHOT/archiva-consumer-api-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-consumers/1.0-SNAPSHOT/archiva-consumers-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-consumers/1.0-SNAPSHOT/archiva-consumers-1.0-SNAPSHOT.pom
index 8969b9ed3..8969b9ed3 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-consumers/1.0-SNAPSHOT/archiva-consumers-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-consumers/1.0-SNAPSHOT/archiva-consumers-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-converter/1.0-SNAPSHOT/archiva-converter-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-converter/1.0-SNAPSHOT/archiva-converter-1.0-SNAPSHOT.pom
index 49bde7bd2..49bde7bd2 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-converter/1.0-SNAPSHOT/archiva-converter-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-converter/1.0-SNAPSHOT/archiva-converter-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-core-consumers/1.0-SNAPSHOT/archiva-core-consumers-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-core-consumers/1.0-SNAPSHOT/archiva-core-consumers-1.0-SNAPSHOT.pom
index 182578f57..182578f57 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-core-consumers/1.0-SNAPSHOT/archiva-core-consumers-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-core-consumers/1.0-SNAPSHOT/archiva-core-consumers-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-core/1.0-SNAPSHOT/archiva-core-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-core/1.0-SNAPSHOT/archiva-core-1.0-SNAPSHOT.pom
index 18b98fc7b..18b98fc7b 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-core/1.0-SNAPSHOT/archiva-core-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-core/1.0-SNAPSHOT/archiva-core-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-discoverer/1.0-SNAPSHOT/archiva-discoverer-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-discoverer/1.0-SNAPSHOT/archiva-discoverer-1.0-SNAPSHOT.pom
index 8a96e39c5..8a96e39c5 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-discoverer/1.0-SNAPSHOT/archiva-discoverer-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-discoverer/1.0-SNAPSHOT/archiva-discoverer-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-indexer/1.0-SNAPSHOT/archiva-indexer-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-indexer/1.0-SNAPSHOT/archiva-indexer-1.0-SNAPSHOT.pom
index 7d77d445f..7d77d445f 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-indexer/1.0-SNAPSHOT/archiva-indexer-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-indexer/1.0-SNAPSHOT/archiva-indexer-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-model/1.0-SNAPSHOT/archiva-model-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-model/1.0-SNAPSHOT/archiva-model-1.0-SNAPSHOT.pom
index 9c9053a3c..9c9053a3c 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-model/1.0-SNAPSHOT/archiva-model-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-model/1.0-SNAPSHOT/archiva-model-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-parent/1.0-SNAPSHOT/archiva-parent-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-parent/1.0-SNAPSHOT/archiva-parent-1.0-SNAPSHOT.pom
index 970098384..970098384 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-parent/1.0-SNAPSHOT/archiva-parent-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-parent/1.0-SNAPSHOT/archiva-parent-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-plexus-application/1.0-SNAPSHOT/archiva-plexus-application-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-plexus-application/1.0-SNAPSHOT/archiva-plexus-application-1.0-SNAPSHOT.pom
index 21edbff05..21edbff05 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-plexus-application/1.0-SNAPSHOT/archiva-plexus-application-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-plexus-application/1.0-SNAPSHOT/archiva-plexus-application-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-plexus-runtime/1.0-SNAPSHOT/archiva-plexus-runtime-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-plexus-runtime/1.0-SNAPSHOT/archiva-plexus-runtime-1.0-SNAPSHOT.pom
index 1c675dc62..1c675dc62 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-plexus-runtime/1.0-SNAPSHOT/archiva-plexus-runtime-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-plexus-runtime/1.0-SNAPSHOT/archiva-plexus-runtime-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-proxy/1.0-SNAPSHOT/archiva-proxy-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-proxy/1.0-SNAPSHOT/archiva-proxy-1.0-SNAPSHOT.pom
index 23488ee0a..23488ee0a 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-proxy/1.0-SNAPSHOT/archiva-proxy-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-proxy/1.0-SNAPSHOT/archiva-proxy-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-reports-standard/1.0-SNAPSHOT/archiva-reports-standard-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-reports-standard/1.0-SNAPSHOT/archiva-reports-standard-1.0-SNAPSHOT.pom
index 24eb19954..24eb19954 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-reports-standard/1.0-SNAPSHOT/archiva-reports-standard-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-reports-standard/1.0-SNAPSHOT/archiva-reports-standard-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-repository-layer/1.0-SNAPSHOT/archiva-repository-layer-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-repository-layer/1.0-SNAPSHOT/archiva-repository-layer-1.0-SNAPSHOT.pom
index 6ec87f431..6ec87f431 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-repository-layer/1.0-SNAPSHOT/archiva-repository-layer-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-repository-layer/1.0-SNAPSHOT/archiva-repository-layer-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-security/1.0-SNAPSHOT/archiva-security-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-security/1.0-SNAPSHOT/archiva-security-1.0-SNAPSHOT.pom
index 78cbd1282..78cbd1282 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-security/1.0-SNAPSHOT/archiva-security-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-security/1.0-SNAPSHOT/archiva-security-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-webapp/1.0-SNAPSHOT/archiva-webapp-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-webapp/1.0-SNAPSHOT/archiva-webapp-1.0-SNAPSHOT.pom
index 8304d2dd0..8304d2dd0 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-webapp/1.0-SNAPSHOT/archiva-webapp-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-webapp/1.0-SNAPSHOT/archiva-webapp-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-xml-tools/1.0-SNAPSHOT/archiva-xml-tools-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-xml-tools/1.0-SNAPSHOT/archiva-xml-tools-1.0-SNAPSHOT.pom
index efa42d3f0..efa42d3f0 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-xml-tools/1.0-SNAPSHOT/archiva-xml-tools-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-xml-tools/1.0-SNAPSHOT/archiva-xml-tools-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-20061126.005254-2.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-20061126.005254-2.pom
index 201905d46..201905d46 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-20061126.005254-2.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-20061126.005254-2.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-SNAPSHOT-site.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-SNAPSHOT-site.xml
index ac3c2e716..ac3c2e716 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-SNAPSHOT-site.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-SNAPSHOT-site.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-SNAPSHOT.pom
index 31df31eda..31df31eda 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/discovery/1.0/discovery-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/discovery/1.0/discovery-1.0.pom
index 5a29f6117..5a29f6117 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/discovery/1.0/discovery-1.0.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/discovery/1.0/discovery-1.0.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/maven-metadata.xml
index 8ce7fc7bb..8ce7fc7bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/maven-metadata.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/maven-metadata.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4-site.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4-site.xml
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4-site.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4-site.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4-site_en.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4-site_en.xml
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4-site_en.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4-site_en.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4.pom
index 132d9d736..132d9d736 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1
index b6caacf5e..b6caacf5e 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar
index 54d190b23..54d190b23 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom
index 6ab57d162..6ab57d162 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar
index 54d190b23..54d190b23 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom
index a959980df..a959980df 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/samplejar/maven-metadata.xml
index 89de35f4e..89de35f4e 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/samplejar/maven-metadata.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/samplejar/maven-metadata.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar
index ae0cb2e32..ae0cb2e32 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar.md5
index 15a0630f6..15a0630f6 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar.sha1
index 107f46801..107f46801 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-javadoc.jar.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar
index faa0d98cc..faa0d98cc 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar.md5
index 3a84ad832..3a84ad832 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar.sha1
index 3a72dc7bb..3a72dc7bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0-sources.jar.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar
index 712c664dd..712c664dd 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar.md5
index 04d4ce468..04d4ce468 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar.sha1
index 19ae195e0..19ae195e0 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.jar.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom
index d3c136b8c..d3c136b8c 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom.md5
index 89e705b79..89e705b79 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom.sha1
index 1a75091fa..1a75091fa 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.0/maven-downloader-1.0.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar
index 3114e1ae6..3114e1ae6 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar.md5
index 3f77b9093..3f77b9093 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar.sha1
index 1b0a186fc..1b0a186fc 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-javadoc.jar.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar
index 994054bb4..994054bb4 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar.md5
index aada2770b..aada2770b 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar.sha1
index 37af4fe89..37af4fe89 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1-sources.jar.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar
index ae6638b79..ae6638b79 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar.md5
index f5c14a937..f5c14a937 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar.sha1
index 1bcc406e0..1bcc406e0 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.jar.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom
index db5fe99e7..db5fe99e7 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom.md5
index bffe895ee..bffe895ee 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom.sha1
index fb062b05f..fb062b05f 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/1.1/maven-downloader-1.1.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml
index 6fbced025..6fbced025 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml.md5
index 354ec6c58..354ec6c58 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml.sha1
index 0ff8edcaf..0ff8edcaf 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/shared/maven-downloader/maven-metadata.xml.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/test/2.0.4-SNAPSHOT/test-2.0.4-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/test/2.0.4-SNAPSHOT/test-2.0.4-SNAPSHOT.pom
index ca115b505..ca115b505 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/test/2.0.4-SNAPSHOT/test-2.0.4-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/test/2.0.4-SNAPSHOT/test-2.0.4-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.zip b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.zip
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.zip
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.zip
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar
index 54d190b23..54d190b23 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom
index 452727f28..452727f28 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/update/test-not-updated/maven-metadata.xml
index bd56a21c1..bd56a21c1 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/maven-metadata.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/update/test-not-updated/maven-metadata.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar
index 54d190b23..54d190b23 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom
index edd7b6479..edd7b6479 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-updated/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/update/test-updated/maven-metadata.xml
index 86e063ca8..86e063ca8 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/maven/update/test-updated/maven-metadata.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/update/test-updated/maven-metadata.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom
index 12538e81a..12538e81a 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml
index 8ee18048c..8ee18048c 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/testgroup/discovery/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/testgroup/discovery/maven-metadata.xml
index b024ef7ef..b024ef7ef 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/org/apache/testgroup/discovery/maven-metadata.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/testgroup/discovery/maven-metadata.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-api/2.4.4/test-project-api-2.4.4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/test-project/test-project-api/2.4.4/test-project-api-2.4.4.pom
index fa0c87e5c..fa0c87e5c 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-api/2.4.4/test-project-api-2.4.4.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/test-project/test-project-api/2.4.4/test-project-api-2.4.4.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-broker-ejb/2.4.4/test-project-broker-ejb-2.4.4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/test-project/test-project-broker-ejb/2.4.4/test-project-broker-ejb-2.4.4.pom
index b333a52d2..b333a52d2 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-broker-ejb/2.4.4/test-project-broker-ejb-2.4.4.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/test-project/test-project-broker-ejb/2.4.4/test-project-broker-ejb-2.4.4.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-broker-pom/2.4.4/test-project-broker-pom-2.4.4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/test-project/test-project-broker-pom/2.4.4/test-project-broker-pom-2.4.4.pom
index fd5473630..fd5473630 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-broker-pom/2.4.4/test-project-broker-pom-2.4.4.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/test-project/test-project-broker-pom/2.4.4/test-project-broker-pom-2.4.4.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-common/2.4.4/test-project-common-2.4.4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/test-project/test-project-common/2.4.4/test-project-common-2.4.4.pom
index d47958b23..d47958b23 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-common/2.4.4/test-project-common-2.4.4.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/test-project/test-project-common/2.4.4/test-project-common-2.4.4.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-endpoint-ejb/2.4.4/test-project-endpoint-ejb-2.4.4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/test-project/test-project-endpoint-ejb/2.4.4/test-project-endpoint-ejb-2.4.4.pom
index 582f1e5e1..582f1e5e1 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-endpoint-ejb/2.4.4/test-project-endpoint-ejb-2.4.4.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/test-project/test-project-endpoint-ejb/2.4.4/test-project-endpoint-ejb-2.4.4.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-endpoint-pom/2.4.4/test-project-endpoint-pom-2.4.4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/test-project/test-project-endpoint-pom/2.4.4/test-project-endpoint-pom-2.4.4.pom
index ea4d6372d..ea4d6372d 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project-endpoint-pom/2.4.4/test-project-endpoint-pom-2.4.4.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/test-project/test-project-endpoint-pom/2.4.4/test-project-endpoint-pom-2.4.4.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project/2.4.4/test-project-2.4.4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/test-project/test-project/2.4.4/test-project-2.4.4.pom
index 6dc471979..6dc471979 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/default-repository/test-project/test-project/2.4.4/test-project-2.4.4.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/test-project/test-project/2.4.4/test-project-2.4.4.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/bad_artifact/empty.txt b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/bad_artifact/empty.txt
index 1f855bdb8..1f855bdb8 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/bad_artifact/empty.txt
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/bad_artifact/empty.txt
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.pom
index 18cd43943..18cd43943 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.xml
index 176a50bcf..176a50bcf 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/maven-metadata.xml
index 624cbdace..624cbdace 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/maven-metadata.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/maven-metadata.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/incomplete_metadata_a/1.0/incomplete_metadata_a-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/incomplete_metadata_a/1.0/incomplete_metadata_a-1.0.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/incomplete_metadata_a/1.0/incomplete_metadata_a-1.0.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/incomplete_metadata_a/1.0/incomplete_metadata_a-1.0.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/incomplete_metadata_a/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/incomplete_metadata_a/maven-metadata.xml
index 5ecf49673..5ecf49673 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/incomplete_metadata_a/maven-metadata.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/incomplete_metadata_a/maven-metadata.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/maven-metadata.xml
index e8840e709..e8840e709 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/maven-metadata.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/maven-metadata.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/missing_artifact-1.0-20091007.132409-1.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/missing_artifact-1.0-20091007.132409-1.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/missing_artifact-1.0-20091007.132409-1.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/missing_artifact-1.0-20091007.132409-1.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/missing_artifact-1.0-20091007.132409-1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/missing_artifact-1.0-20091007.132409-1.pom
index d2c43abe5..d2c43abe5 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/missing_artifact-1.0-20091007.132409-1.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.0-SNAPSHOT/missing_artifact-1.0-20091007.132409-1.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/maven-metadata.xml
index 1487bb280..1487bb280 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/maven-metadata.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/maven-metadata.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/missing_artifact-1.2-20091011.133751-1.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/missing_artifact-1.2-20091011.133751-1.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/missing_artifact-1.2-20091011.133751-1.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/missing_artifact-1.2-20091011.133751-1.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/missing_artifact-1.2-20091011.133751-1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/missing_artifact-1.2-20091011.133751-1.pom
index f68e5230b..f68e5230b 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/missing_artifact-1.2-20091011.133751-1.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/1.2-SNAPSHOT/missing_artifact-1.2-20091011.133751-1.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/maven-metadata.xml
index 3867fb5bd..3867fb5bd 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/maven-metadata.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_artifact/maven-metadata.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_a/1.0/missing_metadata_a-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_a/1.0/missing_metadata_a-1.0.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_a/1.0/missing_metadata_a-1.0.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_a/1.0/missing_metadata_a-1.0.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/1.0.1/missing_metadata_b-1.0.1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/1.0.1/missing_metadata_b-1.0.1.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/1.0.1/missing_metadata_b-1.0.1.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/1.0.1/missing_metadata_b-1.0.1.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/1.0/missing_metadata_b-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/1.0/missing_metadata_b-1.0.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/1.0/missing_metadata_b-1.0.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/1.0/missing_metadata_b-1.0.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0-20070821-dev/missing_metadata_b-2.0-20070821-dev.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0-20070821-dev/missing_metadata_b-2.0-20070821-dev.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0-20070821-dev/missing_metadata_b-2.0-20070821-dev.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0-20070821-dev/missing_metadata_b-2.0-20070821-dev.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0.1/missing_metadata_b-2.0.1.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0.1/missing_metadata_b-2.0.1.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0.1/missing_metadata_b-2.0.1.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0.1/missing_metadata_b-2.0.1.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0/missing_metadata_b-2.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0/missing_metadata_b-2.0.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0/missing_metadata_b-2.0.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/missing_metadata_b/2.0/missing_metadata_b-2.0.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/1.0/proxied_multi-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/1.0/proxied_multi-1.0.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/1.0/proxied_multi-1.0.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/1.0/proxied_multi-1.0.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/1.1/proxied_multi-1.1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/1.1/proxied_multi-1.1.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/1.1/proxied_multi-1.1.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/1.1/proxied_multi-1.1.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/2.1/proxied_multi-2.1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/2.1/proxied_multi-2.1.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/2.1/proxied_multi-2.1.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/2.1/proxied_multi-2.1.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata-central.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata-central.xml
index a8b764bd7..a8b764bd7 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata-central.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata-central.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata-java.net.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata-java.net.xml
index 13024c74e..13024c74e 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata-java.net.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata-java.net.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata.xml
index a1e402c94..a1e402c94 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/proxied_multi/maven-metadata.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-apache-snapshots.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-apache-snapshots.xml
index f3e0dbd0a..f3e0dbd0a 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-apache-snapshots.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-apache-snapshots.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-internal-snapshots.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-internal-snapshots.xml
index f3e0dbd0a..f3e0dbd0a 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-internal-snapshots.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-internal-snapshots.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-snapshots.codehaus.org.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-snapshots.codehaus.org.xml
index f62d4482f..f62d4482f 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-snapshots.codehaus.org.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata-snapshots.codehaus.org.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata.xml
index 3265734bd..3265734bd 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/maven-metadata.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2-javadoc.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2-javadoc.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2-javadoc.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2-javadoc.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2-sources.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2-sources.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2-sources.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2.war b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2.war
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2.war
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070221.194724-2.war
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3-sources.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3-sources.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3-sources.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3.war b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3.war
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3.war
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070302.212723-3.war
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4-sources.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4-sources.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4-sources.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4.war b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4.war
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4.war
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070303.152828-4.war
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.pom.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.war b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.war
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.war
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.war
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.war.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.war.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.war.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070305.215149-5.war.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.pom.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.war b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.war
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.war
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.war
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.war.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.war.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.war.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070307.170909-6.war.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.pom.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.war b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.war
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.war
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.war
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.war.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.war.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.war.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070314.211405-9.war.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.pom.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.war b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.war
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.war
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.war
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.war.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.war.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.war.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-20070316.175232-11.war.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT-sources.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT-sources.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT-sources.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT.war b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT.war
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT.war
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_a/1.0-alpha-11-SNAPSHOT/snap_shots_a-1.0-alpha-11-SNAPSHOT.war
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/maven-metadata.xml
index efda5def5..efda5def5 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/maven-metadata.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/maven-metadata.xml
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.jar.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.172940-1.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2-sources.jar.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.jar.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070221.194724-2.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3-sources.jar.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.jar.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070302.212723-3.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4-sources.jar.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.jar.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070303.152828-4.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.jar.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070305.215149-5.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.jar.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070307.170909-6.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.jar.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.190911-7.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.jar.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.193642-8.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-javadoc.jar.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9-sources.jar.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.jar.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070314.211405-9.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.jar.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom.md5 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom.md5
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom.md5
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom.md5
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom.sha1 b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom.sha1
index e69de29bb..e69de29bb 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom.sha1
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/metadata-repository/org/apache/archiva/metadata/tests/snap_shots_b/2.2-SNAPSHOT/snap_shots_b-2.2-20070316.153953-10.pom.sha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-no-mock-conf.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-no-mock-conf.xml
index b5de647ad..3f6b35271 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-no-mock-conf.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-no-mock-conf.xml
@@ -27,7 +27,7 @@
            http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
   <context:annotation-config/>
-  <context:component-scan base-package="org.apache.archiva.metadata.repository.storage.maven2.conf,org.apache.archiva.repository.content.maven2"/>
+  <context:component-scan base-package="org.apache.archiva.metadata.repository.storage.maven2.conf,org.apache.archiva.repository.content.maven2,org.apache.archiva.repository.maven2.util"/>
 
 
 
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
index 8cf4ec039..4c6561bcc 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
@@ -25,7 +25,6 @@ import org.apache.archiva.checksum.ChecksumAlgorithm;
 import org.apache.archiva.checksum.ChecksummedFile;
 import org.apache.archiva.common.utils.VersionComparator;
 import org.apache.archiva.common.utils.VersionUtil;
-import org.apache.archiva.maven2.metadata.MavenMetadataReader;
 import org.apache.archiva.maven2.model.Artifact;
 import org.apache.archiva.metadata.model.ArtifactMetadata;
 import org.apache.archiva.metadata.model.facets.AuditEvent;
@@ -45,6 +44,7 @@ import org.apache.archiva.redback.users.User;
 import org.apache.archiva.redback.users.UserManagerException;
 import org.apache.archiva.redback.users.UserNotFoundException;
 import org.apache.archiva.repository.ContentNotFoundException;
+import org.apache.archiva.repository.LayoutException;
 import org.apache.archiva.repository.ManagedRepository;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.RepositoryException;
@@ -74,7 +74,6 @@ import org.apache.archiva.scheduler.indexing.DownloadRemoteIndexScheduler;
 import org.apache.archiva.scheduler.repository.model.RepositoryTask;
 import org.apache.archiva.security.ArchivaSecurityException;
 import org.apache.archiva.security.common.ArchivaRoleConstants;
-import org.apache.archiva.xml.XMLException;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -685,7 +684,7 @@ public class DefaultRepositoriesService
 
             MetadataRepository metadataRepository = repositorySession.getRepository();
 
-            Set<ArtifactReference> related = repository.getRelatedArtifacts( artifactReference );
+            List<ArtifactReference> related = repository.getRelatedArtifacts( artifactReference );
             log.debug( "related: {}", related );
             for ( ArtifactReference artifactRef : related )
             {
@@ -702,15 +701,7 @@ public class DefaultRepositoriesService
 
             metadataRepository.removeProjectVersion(repositorySession , repositoryId, namespace, projectId, version );
         }
-        catch ( MetadataRepositoryException e )
-        {
-            throw new ArchivaRestServiceException( "Repository exception: " + e.getMessage(), 500, e );
-        }
-        catch ( MetadataResolutionException e )
-        {
-            throw new ArchivaRestServiceException( "Repository exception: " + e.getMessage(), 500, e );
-        }
-        catch ( RepositoryException e )
+        catch ( MetadataRepositoryException | MetadataResolutionException | RepositoryException | LayoutException e )
         {
             throw new ArchivaRestServiceException( "Repository exception: " + e.getMessage(), 500, e );
         }
@@ -726,6 +717,7 @@ public class DefaultRepositoriesService
             repositorySession.close();
         }
 
+
         return Boolean.TRUE;
     }
 
@@ -841,7 +833,7 @@ public class DefaultRepositoriesService
                 }
                 else
                 {
-                    Set<ArtifactReference> related = repository.getRelatedArtifacts( artifactReference );
+                    List<ArtifactReference> related = repository.getRelatedArtifacts( artifactReference );
                     log.debug( "related: {}", related );
                     for ( ArtifactReference artifactRef : related )
                     {
@@ -960,11 +952,7 @@ public class DefaultRepositoriesService
         {
             throw new ArchivaRestServiceException( "Repository exception: " + e.getMessage(), 500, e );
         }
-        catch (MetadataResolutionException | MetadataSessionException e )
-        {
-            throw new ArchivaRestServiceException( "Repository exception: " + e.getMessage(), 500, e );
-        }
-        catch ( MetadataRepositoryException e )
+        catch (MetadataResolutionException | MetadataSessionException | MetadataRepositoryException | LayoutException e )
         {
             throw new ArchivaRestServiceException( "Repository exception: " + e.getMessage(), 500, e );
         }