You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ep...@apache.org on 2005/12/19 04:05:03 UTC

svn commit: r357620 - in /maven/repository-manager/trunk/maven-repository-discovery: ./ src/main/resources/META-INF/plexus/ src/test/java/org/apache/maven/repository/discovery/ src/test/repository/org/apache/maven/some-ejb/1.0/

Author: epunzalan
Date: Sun Dec 18 19:04:49 2005
New Revision: 357620

URL: http://svn.apache.org/viewcvs?rev=357620&view=rev
Log:
PR: MRM-42
Submitted by: Maria Odea Ching

Class for discovering repository metadata and fixed failing tests on DefaultArtifactDiscovererTest and LegacyArtifactDiscovererTest

Added:
    maven/repository-manager/trunk/maven-repository-discovery/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata-repository.xml   (with props)
Modified:
    maven/repository-manager/trunk/maven-repository-discovery/pom.xml
    maven/repository-manager/trunk/maven-repository-discovery/src/main/resources/META-INF/plexus/components.xml
    maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java
    maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java

Modified: maven/repository-manager/trunk/maven-repository-discovery/pom.xml
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/pom.xml?rev=357620&r1=357619&r2=357620&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-discovery/pom.xml (original)
+++ maven/repository-manager/trunk/maven-repository-discovery/pom.xml Sun Dec 18 19:04:49 2005
@@ -21,5 +21,13 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-repository-metadata</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact-manager</artifactId>
+    </dependency>
   </dependencies>
 </project>

Modified: maven/repository-manager/trunk/maven-repository-discovery/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/main/resources/META-INF/plexus/components.xml?rev=357620&r1=357619&r2=357620&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-discovery/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/repository-manager/trunk/maven-repository-discovery/src/main/resources/META-INF/plexus/components.xml Sun Dec 18 19:04:49 2005
@@ -1,6 +1,12 @@
 <component-set>
   <components>
     <component>
+    	<role>org.apache.maven.repository.discovery.MetadataDiscoverer</role>
+    	<role-hint>default</role-hint>
+    	<implementation>org.apache.maven.repository.discovery.DefaultMetadataDiscoverer</implementation>
+    	<instantiation-strategy>per-lookup</instantiation-strategy>
+    </component>    
+    <component>
       <role>org.apache.maven.repository.discovery.ArtifactDiscoverer</role>
       <role-hint>legacy</role-hint>
       <implementation>org.apache.maven.repository.discovery.LegacyArtifactDiscoverer</implementation>
@@ -11,7 +17,6 @@
         </requirement>
       </requirements>
     </component>
-
     <component>
       <role>org.apache.maven.repository.discovery.ArtifactDiscoverer</role>
       <role-hint>default</role-hint>

Modified: maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java?rev=357620&r1=357619&r2=357620&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java (original)
+++ maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java Sun Dec 18 19:04:49 2005
@@ -276,7 +276,7 @@
         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()

Modified: maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java?rev=357620&r1=357619&r2=357620&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java (original)
+++ maven/repository-manager/trunk/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java Sun Dec 18 19:04:49 2005
@@ -261,7 +261,7 @@
         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()

Added: maven/repository-manager/trunk/maven-repository-discovery/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata-repository.xml
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata-repository.xml?rev=357620&view=auto
==============================================================================
    (empty)

Propchange: maven/repository-manager/trunk/maven-repository-discovery/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata-repository.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/repository-manager/trunk/maven-repository-discovery/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata-repository.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"