Author: brett
Date: Wed Mar 10 01:38:29 2010
New Revision: 921202
URL: http://svn.apache.org/viewvc?rev=921202&view=rev
Log:
[MRM-1360] move the maven 2 repository plugin to use the shared test repository
Added:
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/
- copied from r920650,
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/invalid-pom/
- copied from r920650,
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/
- copied from r920650,
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/mislocated-pom/
- copied from r920650,
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/missing-metadata/
- copied from r920650,
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/org/
- copied from r920650,
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/
Removed:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml?rev=921202&r1=921201&r2=921202&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml Wed Mar 10
01:38:29 2010
@@ -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>
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java?rev=921202&r1=921201&r2=921202&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java
Wed Mar 10 01:38:29 2010
@@ -19,8 +19,6 @@ package org.apache.archiva.dependency.tr
* 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.dependenc
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 );
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java?rev=921202&r1=921201&r2=921202&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
Wed Mar 10 01:38:29 2010
@@ -70,7 +70,7 @@ public class Maven2RepositoryMetadataRes
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 Maven2RepositoryMetadataRes
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" ) );
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java?rev=921202&r1=921201&r2=921202&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java
Wed Mar 10 01:38:29 2010
@@ -19,12 +19,12 @@ package org.apache.archiva.metadata.repo
* 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.Plexus
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 MavenRepositoryMetadataRead
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 MavenRepositoryMetadataRead
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 MavenRepositoryMetadataRead
assertEquals( 1, metadata.getSnapshotVersion().getBuildNumber() );
assertEquals( "20080801151215", metadata.getLastUpdated() );
}
+
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+ defaultRepoDir = new File( getBasedir(), "target/test-repository" );
+ }
}
\ No newline at end of file
