From: Edwin L. Punzalan Date: Mon, 19 Dec 2005 03:04:49 +0000 (+0000) Subject: PR: MRM-42 X-Git-Tag: archiva-0.9-alpha-1~1058 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=94473e23b3d3a6b1e25cf1e93e36fbc6d7a78b5f;p=archiva.git PR: MRM-42 Submitted by: Maria Odea Ching Class for discovering repository metadata and fixed failing tests on DefaultArtifactDiscovererTest and LegacyArtifactDiscovererTest git-svn-id: https://svn.apache.org/repos/asf/maven/repository-manager/trunk@357620 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/maven-repository-discovery/pom.xml b/maven-repository-discovery/pom.xml index 651c4f4e2..8426562e3 100755 --- a/maven-repository-discovery/pom.xml +++ b/maven-repository-discovery/pom.xml @@ -21,5 +21,13 @@ org.apache.maven maven-artifact + + org.apache.maven + maven-repository-metadata + + + org.apache.maven + maven-artifact-manager + diff --git a/maven-repository-discovery/src/main/resources/META-INF/plexus/components.xml b/maven-repository-discovery/src/main/resources/META-INF/plexus/components.xml index ceccd778a..3e8ef2c39 100644 --- a/maven-repository-discovery/src/main/resources/META-INF/plexus/components.xml +++ b/maven-repository-discovery/src/main/resources/META-INF/plexus/components.xml @@ -1,5 +1,11 @@ + + org.apache.maven.repository.discovery.MetadataDiscoverer + default + org.apache.maven.repository.discovery.DefaultMetadataDiscoverer + per-lookup + org.apache.maven.repository.discovery.ArtifactDiscoverer legacy @@ -11,7 +17,6 @@ - org.apache.maven.repository.discovery.ArtifactDiscoverer default diff --git a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java b/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java index 902742124..6d2ef2427 100644 --- a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java +++ b/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java @@ -276,7 +276,7 @@ public class DefaultArtifactDiscovererTest assertNotNull( "Check artifacts not null", artifacts ); assertTrue( "Check normal included", - artifacts.contains( createArtifact( "org.apache.maven", "testing", "1.0", "java-source" ) ) ); + artifacts.contains( createArtifact( "org.apache.maven", "testing", "1.0", "java-source", "sources" ) ) ); } public void testDistributionInclusion() diff --git a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java b/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java index 3798f9aec..cf33067d6 100644 --- a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java +++ b/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java @@ -261,7 +261,7 @@ public class LegacyArtifactDiscovererTest assertNotNull( "Check artifacts not null", artifacts ); assertTrue( "Check normal included", - artifacts.contains( createArtifact( "org.apache.maven", "testing", "1.0", "java-source" ) ) ); + artifacts.contains( createArtifact( "org.apache.maven", "testing", "1.0", "java-source", "sources" ) ) ); } public void testDistributionInclusion() diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata-repository.xml b/maven-repository-discovery/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata-repository.xml new file mode 100644 index 000000000..e69de29bb