[MRM-1360] move the maven 2 repository plugin to use the shared test repository

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@921202 13f79535-47bb-0310-9956-ffa450edef68

archiva-modules/plugins/maven2-repository/pom.xml

@@ -17,8 +17,9 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
 -->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>plugins</artifactId>
@@ -83,6 +84,11 @@
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-xml-tools</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>test-repository</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <dependencyManagement>
     <dependencies>
@@ -94,4 +100,26 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test-repository</id>
+            <phase>generate-test-resources</phase>
+            <goals>
+              <goal>unpack-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeArtifactIds>test-repository</includeArtifactIds>
+              <outputDirectory>target/test-repository</outputDirectory>
+              <excludes>META-INF/**</excludes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java

@@ -19,8 +19,6 @@ package org.apache.archiva.dependency.tree.maven2;
  * under the License.
  */
 
-import java.util.Collections;
-
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.Configuration;
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
@@ -33,6 +31,8 @@ import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor;
 import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 import org.easymock.MockControl;
 
+import java.util.Collections;
+
 public class DependencyTreeBuilderTest
     extends PlexusInSpringTestCase
 {
@@ -59,7 +59,7 @@ public class DependencyTreeBuilderTest
         Configuration configuration = new Configuration();
         ManagedRepositoryConfiguration repoConfig = new ManagedRepositoryConfiguration();
         repoConfig.setId( TEST_REPO_ID );
-        repoConfig.setLocation( getTestPath( "src/test/repositories/test" ) );
+        repoConfig.setLocation( getTestPath( "target/test-repository" ) );
         configuration.addManagedRepository( repoConfig );
         config.save( configuration );
 

archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java

@@ -70,7 +70,7 @@ public class Maven2RepositoryMetadataResolverTest
         Configuration c = new Configuration();
         ManagedRepositoryConfiguration testRepo = new ManagedRepositoryConfiguration();
         testRepo.setId( TEST_REPO_ID );
-        testRepo.setLocation( getTestPath( "src/test/repositories/test" ) );
+        testRepo.setLocation( getTestPath( "target/test-repository" ) );
         c.addManagedRepository( testRepo );
         configuration.save( c );
 
@@ -344,7 +344,8 @@ public class Maven2RepositoryMetadataResolverTest
         assertEquals( Collections.<String>emptyList(), resolver.getProjects( TEST_REPO_ID, "com" ) );
         assertEquals( Collections.<String>emptyList(), resolver.getProjects( TEST_REPO_ID, "com.example" ) );
         assertEquals( Arrays.asList( "incomplete-metadata", "invalid-pom", "malformed-metadata", "mislocated-pom",
-                                     "missing-metadata" ), resolver.getProjects( TEST_REPO_ID, "com.example.test" ) );
+                                     "missing-metadata", "test-artifact" ), resolver.getProjects( TEST_REPO_ID,
+                                                                                                  "com.example.test" ) );
 
         assertEquals( Collections.<String>emptyList(), resolver.getProjects( TEST_REPO_ID, "org" ) );
         assertEquals( Arrays.asList( "apache" ), resolver.getProjects( TEST_REPO_ID, "org.apache" ) );

archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java

@@ -19,12 +19,12 @@ package org.apache.archiva.metadata.repository.storage.maven2;
  * under the License.
  */
 
-import java.io.File;
-import java.util.Arrays;
-
 import org.apache.maven.archiva.xml.XMLException;
 import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 
+import java.io.File;
+import java.util.Arrays;
+
 /**
  * RepositoryMetadataReaderTest
  *
@@ -33,10 +33,11 @@ import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 public class MavenRepositoryMetadataReaderTest
     extends PlexusInSpringTestCase
 {
+    private File defaultRepoDir;
+
     public void testGroupMetadata()
         throws XMLException
     {
-        File defaultRepoDir = new File( getBasedir(), "src/test/repositories/test" );
         File metadataFile = new File( defaultRepoDir, "org/apache/maven/plugins/maven-metadata.xml" );
 
         MavenRepositoryMetadata metadata = MavenRepositoryMetadataReader.read( metadataFile );
@@ -71,7 +72,6 @@ public class MavenRepositoryMetadataReaderTest
     public void testProjectMetadata()
         throws XMLException
     {
-        File defaultRepoDir = new File( getBasedir(), "src/test/repositories/test" );
         File metadataFile = new File( defaultRepoDir, "org/apache/maven/shared/maven-downloader/maven-metadata.xml" );
 
         MavenRepositoryMetadata metadata = MavenRepositoryMetadataReader.read( metadataFile );
@@ -89,7 +89,6 @@ public class MavenRepositoryMetadataReaderTest
     public void testProjectVersionMetadata()
         throws XMLException
     {
-        File defaultRepoDir = new File( getBasedir(), "src/test/repositories/test" );
         File metadataFile = new File( defaultRepoDir, "org/apache/apache/5-SNAPSHOT/maven-metadata.xml" );
 
         MavenRepositoryMetadata metadata = MavenRepositoryMetadataReader.read( metadataFile );
@@ -105,4 +104,11 @@ public class MavenRepositoryMetadataReaderTest
         assertEquals( 1, metadata.getSnapshotVersion().getBuildNumber() );
         assertEquals( "20080801151215", metadata.getLastUpdated() );
     }
+
+    protected void setUp()
+        throws Exception
+    {
+        super.setUp();
+        defaultRepoDir = new File( getBasedir(), "target/test-repository" );
+    }
 }