[MRM-161] introduce a model for storing reports in the repository, and wire them up on the back of the indexer.

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

5 files changed, 20 insertions, 7 deletions

diff --git a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscoverer.java
index 844daad06..898559fe3 100644
--- a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscoverer.java
+++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscoverer.java
@@ -73,7 +73,10 @@ public abstract class AbstractArtifactDiscoverer
                 {
                     artifacts.add( artifact );
                 }
-                // TODO: else add to excluded? [!]
+                else
+                {
+                    addExcludedPath( path, "Omitted by filter" );
+                }
             }
             catch ( DiscovererException e )
             {
diff --git a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java
index d509be684..b902d67c5 100644
--- a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java
+++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java
@@ -67,6 +67,17 @@ public abstract class AbstractDiscoverer
     }
 
     /**
+     * Add a path to the list of files that were excluded.
+     *
+     * @param path   the path to add
+     * @param reason the reason why the path is excluded
+     */
+    protected void addExcludedPath( String path, String reason )
+    {
+        excludedPaths.add( new DiscovererPath( path, reason ) );
+    }
+
+    /**
      * Returns an iterator for the list if DiscovererPaths that were found to not represent a searched object
      *
      * @return Iterator for the DiscovererPath List
diff --git a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscoverer.java
index 175f7bde2..77bbb1932 100644
--- a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscoverer.java
+++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscoverer.java
@@ -58,7 +58,7 @@ public class DefaultMetadataDiscoverer
      */
     private static final String[] STANDARD_DISCOVERY_INCLUDES = {"**/maven-metadata.xml"};
 
-    public List discoverMetadata( ArtifactRepository repository, String operation, List blacklistedPatterns )
+    public List discoverMetadata( ArtifactRepository repository, List blacklistedPatterns )
         throws DiscovererException
     {
         if ( !"file".equals( repository.getProtocol() ) )
diff --git a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/MetadataDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/MetadataDiscoverer.java
index 2c470a3c2..01243ad84 100644
--- a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/MetadataDiscoverer.java
+++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/MetadataDiscoverer.java
@@ -32,11 +32,10 @@ public interface MetadataDiscoverer
      * Search for metadata files in the repository.
      *
      * @param repository          The repository.
-     * @param operation           the operation being performed (used for timestamp comparison)
      * @param blacklistedPatterns Patterns that are to be excluded from the discovery process.
      * @return the list of artifacts found
      * @throws DiscovererException if there is a problem during the discovery process
      */
-    List discoverMetadata( ArtifactRepository repository, String operation, List blacklistedPatterns )
+    List discoverMetadata( ArtifactRepository repository, List blacklistedPatterns )
         throws DiscovererException;
 }
diff --git a/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscovererTest.java b/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscovererTest.java
index 8a7dece97..027c9874d 100644
--- a/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscovererTest.java
+++ b/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscovererTest.java
@@ -91,7 +91,7 @@ public class DefaultMetadataDiscovererTest
     public void testKickoutWrongDirectory()
         throws DiscovererException
     {
-        discoverer.discoverMetadata( repository, TEST_OPERATION, null );
+        discoverer.discoverMetadata( repository, null );
         Iterator iter = discoverer.getKickedOutPathsIterator();
         boolean found = false;
         while ( iter.hasNext() && !found )
@@ -116,7 +116,7 @@ public class DefaultMetadataDiscovererTest
     public void testKickoutBlankMetadata()
         throws DiscovererException
     {
-        discoverer.discoverMetadata( repository, TEST_OPERATION, null );
+        discoverer.discoverMetadata( repository, null );
         Iterator iter = discoverer.getKickedOutPathsIterator();
         boolean found = false;
         while ( iter.hasNext() && !found )
@@ -148,7 +148,7 @@ public class DefaultMetadataDiscovererTest
     public void testDiscoverMetadata()
         throws DiscovererException
     {
-        List metadataPaths = discoverer.discoverMetadata( repository, TEST_OPERATION, null );
+        List metadataPaths = discoverer.discoverMetadata( repository, null );
         assertNotNull( "Check metadata not null", metadataPaths );
 
         RepositoryMetadata metadata =