o breaking the reporting into packages to get a grip of the architecture

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

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/ReportingDatabase.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.database;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -20,6 +20,7 @@ import org.apache.maven.archiva.reporting.model.ArtifactResults;
 import org.apache.maven.archiva.reporting.model.MetadataResults;
 import org.apache.maven.archiva.reporting.model.Reporting;
 import org.apache.maven.archiva.reporting.model.Result;
+import org.apache.maven.archiva.reporting.group.ReportGroup;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/executor/DefaultReportExecutor.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.executor;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -20,6 +20,11 @@ import org.apache.maven.archiva.discoverer.ArtifactDiscoverer;
 import org.apache.maven.archiva.discoverer.DiscovererException;
 import org.apache.maven.archiva.discoverer.MetadataDiscoverer;
 import org.apache.maven.archiva.discoverer.filter.AcceptAllMetadataFilter;
+import org.apache.maven.archiva.reporting.group.ReportGroup;
+import org.apache.maven.archiva.reporting.executor.ReportExecutor;
+import org.apache.maven.archiva.reporting.store.ReportingStore;
+import org.apache.maven.archiva.reporting.store.ReportingStoreException;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.InvalidArtifactRTException;
 import org.apache.maven.artifact.factory.ArtifactFactory;

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/executor/ReportExecutor.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.executor;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -17,6 +17,9 @@ package org.apache.maven.archiva.reporting;
  */
 
 import org.apache.maven.archiva.discoverer.DiscovererException;
+import org.apache.maven.archiva.reporting.group.ReportGroup;
+import org.apache.maven.archiva.reporting.store.ReportingStoreException;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
 
@@ -38,7 +41,7 @@ public interface ReportExecutor
      * @param reportGroup the report set to run
      * @param metadata    the RepositoryMetadata objects to report on
      * @param repository  the repository that they come from
-     * @throws ReportingStoreException if there is a problem reading/writing the report database
+     * @throws org.apache.maven.archiva.reporting.store.ReportingStoreException if there is a problem reading/writing the report database
      */
     public void runMetadataReports( ReportGroup reportGroup, List metadata, ArtifactRepository repository )
         throws ReportingStoreException;

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/filter/ReportingMetadataFilter.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.filter;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -17,6 +17,7 @@ package org.apache.maven.archiva.reporting;
  */
 
 import org.apache.maven.archiva.discoverer.filter.MetadataFilter;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
 
 /**

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/group/AbstractReportGroup.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.group;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -20,6 +20,10 @@ import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
 import org.apache.maven.model.Model;
+import org.apache.maven.archiva.reporting.group.ReportGroup;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
+import org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor;
+import org.apache.maven.archiva.reporting.processor.MetadataReportProcessor;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -31,12 +35,12 @@ public abstract class AbstractReportGroup
     implements ReportGroup
 {
     /**
-     * @plexus.requirement role="org.apache.maven.archiva.reporting.ArtifactReportProcessor"
+     * @plexus.requirement role="org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor"
      */
     private Map artifactReports;
 
     /**
-     * @plexus.requirement role="org.apache.maven.archiva.reporting.MetadataReportProcessor"
+     * @plexus.requirement role="org.apache.maven.archiva.reporting.processor.MetadataReportProcessor"
      */
     private Map metadataReports;
 

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/group/DefaultReportGroup.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.group;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,13 +16,15 @@ package org.apache.maven.archiva.reporting;
  * limitations under the License.
  */
 
+import org.apache.maven.archiva.reporting.group.AbstractReportGroup;
+
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
  * The default report set, for repository health.
  *
- * @plexus.component role="org.apache.maven.archiva.reporting.ReportGroup" role-hint="health"
+ * @plexus.component role="org.apache.maven.archiva.reporting.group.ReportGroup" role-hint="health"
  * @todo could these report groups be assembled dynamically by configuration rather than as explicit components? eg, reportGroup.addReport( ARP ), reportGroup.addReport( MRP )
  */
 public class DefaultReportGroup

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/group/OldArtifactReportGroup.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.group;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,13 +16,15 @@ package org.apache.maven.archiva.reporting;
  * limitations under the License.
  */
 
+import org.apache.maven.archiva.reporting.group.AbstractReportGroup;
+
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
  * The report set for finding old artifacts (both snapshot and release)
  *
- * @plexus.component role="org.apache.maven.archiva.reporting.ReportGroup" role-hint="old-artifact"
+ * @plexus.component role="org.apache.maven.archiva.reporting.group.ReportGroup" role-hint="old-artifact"
  */
 public class OldArtifactReportGroup
     extends AbstractReportGroup

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/group/ReportGroup.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.group;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -20,6 +20,7 @@ import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
 import org.apache.maven.model.Model;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 
 import java.util.Map;
 

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/ArtifactReportProcessor.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.processor;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -18,6 +18,7 @@ package org.apache.maven.archiva.reporting;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.model.Model;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 
 /**
  * This interface will be called by the main system for each artifact as it is discovered. This is how each of the

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/BadMetadataReportProcessor.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.processor;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -18,6 +18,8 @@ package org.apache.maven.archiva.reporting;
 
 import org.apache.maven.archiva.layer.RepositoryQueryLayer;
 import org.apache.maven.archiva.layer.RepositoryQueryLayerFactory;
+import org.apache.maven.archiva.reporting.processor.MetadataReportProcessor;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -26,7 +28,7 @@ import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
 import org.apache.maven.artifact.repository.metadata.Snapshot;
 import org.apache.maven.artifact.repository.metadata.Versioning;
 import org.codehaus.plexus.util.FileUtils;
-import org.apache.commons.lang.StringUtils;
+import org.codehaus.plexus.util.StringUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -42,7 +44,7 @@ import java.util.Map;
  * This class will report on bad metadata files.  These include invalid version declarations and incomplete version
  * information inside the metadata file.  Plugin metadata will be checked for validity of the latest plugin artifacts.
  *
- * @plexus.component role="org.apache.maven.archiva.reporting.MetadataReportProcessor" role-hint="bad-metadata"
+ * @plexus.component role="org.apache.maven.archiva.reporting.processor.MetadataReportProcessor" role-hint="bad-metadata"
  */
 public class BadMetadataReportProcessor
     implements MetadataReportProcessor

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/ChecksumArtifactReportProcessor.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.processor;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -19,6 +19,8 @@ package org.apache.maven.archiva.reporting;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.model.Model;
+import org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 import org.codehaus.plexus.digest.Digester;
 import org.codehaus.plexus.digest.DigesterException;
 import org.codehaus.plexus.util.FileUtils;
@@ -30,7 +32,7 @@ import java.io.IOException;
  * This class reports invalid and mismatched checksums of artifacts and metadata files.
  * It validates MD5 and SHA-1 checksums.
  *
- * @plexus.component role="org.apache.maven.archiva.reporting.ArtifactReportProcessor" role-hint="checksum"
+ * @plexus.component role="org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor" role-hint="checksum"
  */
 public class ChecksumArtifactReportProcessor
     implements ArtifactReportProcessor

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/ChecksumMetadataReportProcessor.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.processor;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -18,6 +18,8 @@ package org.apache.maven.archiva.reporting;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
+import org.apache.maven.archiva.reporting.processor.MetadataReportProcessor;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 import org.codehaus.plexus.digest.Digester;
 import org.codehaus.plexus.digest.DigesterException;
 import org.codehaus.plexus.util.FileUtils;
@@ -29,7 +31,7 @@ import java.io.IOException;
  * This class reports invalid and mismatched checksums of artifacts and metadata files.
  * It validates MD5 and SHA-1 checksums.
  *
- * @plexus.component role="org.apache.maven.archiva.reporting.MetadataReportProcessor" role-hint="checksum-metadata"
+ * @plexus.component role="org.apache.maven.archiva.reporting.processor.MetadataReportProcessor" role-hint="checksum-metadata"
  */
 public class ChecksumMetadataReportProcessor
     implements MetadataReportProcessor

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/DependencyArtifactReportProcessor.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.processor;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -18,6 +18,8 @@ package org.apache.maven.archiva.reporting;
 
 import org.apache.maven.archiva.layer.RepositoryQueryLayer;
 import org.apache.maven.archiva.layer.RepositoryQueryLayerFactory;
+import org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
@@ -30,7 +32,7 @@ import java.util.Iterator;
 import java.util.List;
 
 /**
- * @plexus.component role="org.apache.maven.archiva.reporting.ArtifactReportProcessor" role-hint="dependency"
+ * @plexus.component role="org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor" role-hint="dependency"
  */
 public class DependencyArtifactReportProcessor
     implements ArtifactReportProcessor

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessor.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.processor;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -24,6 +24,8 @@ import org.apache.maven.archiva.indexer.RepositoryIndexSearchException;
 import org.apache.maven.archiva.indexer.lucene.LuceneQuery;
 import org.apache.maven.archiva.indexer.record.StandardArtifactIndexRecord;
 import org.apache.maven.archiva.indexer.record.StandardIndexRecordFields;
+import org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.model.Model;
@@ -38,7 +40,7 @@ import java.util.List;
  * Validates an artifact file for duplicates within the same groupId based from what's available in a repository index.
  *
  * @author Edwin Punzalan
- * @plexus.component role="org.apache.maven.archiva.reporting.ArtifactReportProcessor" role-hint="duplicate"
+ * @plexus.component role="org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor" role-hint="duplicate"
  */
 public class DuplicateArtifactFileReportProcessor
     implements ArtifactReportProcessor
@@ -65,7 +67,11 @@ public class DuplicateArtifactFileReportProcessor
         ArtifactRepository repository = artifact.getRepository();
         if ( artifact.getFile() != null )
         {
-            RepositoryArtifactIndex index = indexFactory.createStandardIndex( new File( indexDirectory ) );
+            System.out.println( "indexDirectory = " + indexDirectory );
+            
+            File indexDirectoryFile = new File( indexDirectory );
+
+            RepositoryArtifactIndex index = indexFactory.createStandardIndex( indexDirectoryFile );
 
             String checksum = null;
             try

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/InvalidPomArtifactReportProcessor.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.processor;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -20,6 +20,8 @@ import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
@@ -32,7 +34,7 @@ import java.io.Reader;
  * This class validates well-formedness of pom xml file.
  *
  * @todo nice to have this a specific, tested report - however it is likely to double up with project building exceptions from IndexerTask. Resolve [!]
- * @plexus.component role="org.apache.maven.archiva.reporting.ArtifactReportProcessor" role-hint="invalid-pom"
+ * @plexus.component role="org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor" role-hint="invalid-pom"
  */
 public class InvalidPomArtifactReportProcessor
     implements ArtifactReportProcessor

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/LocationArtifactReportProcessor.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.processor;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -23,6 +23,8 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
@@ -42,7 +44,7 @@ import java.util.jar.JarFile;
  * in its pom (both the pom packaged with the artifact & the pom in the
  * file system).
  *
- * @plexus.component role="org.apache.maven.archiva.reporting.ArtifactReportProcessor" role-hint="artifact-location"
+ * @plexus.component role="org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor" role-hint="artifact-location"
  */
 public class LocationArtifactReportProcessor
     implements ArtifactReportProcessor

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/MetadataReportProcessor.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.processor;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -18,6 +18,7 @@ package org.apache.maven.archiva.reporting;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 
 /**
  * This interface is called by the main system for each piece of metadata as it is discovered.

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessor.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.processor;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -20,13 +20,15 @@ import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.handler.DefaultArtifactHandler;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.model.Model;
+import org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 
 import java.io.File;
 
 /**
  * Find artifacts in the repository that are considered old.
  *
- * @plexus.component role="org.apache.maven.archiva.reporting.ArtifactReportProcessor" role-hint="old-artifact"
+ * @plexus.component role="org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor" role-hint="old-artifact"
  * @todo make this configurable from the web interface
  */
 public class OldArtifactReportProcessor

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessor.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.processor;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -20,6 +20,8 @@ import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.handler.DefaultArtifactHandler;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.model.Model;
+import org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -35,7 +37,7 @@ import java.util.regex.Matcher;
 /**
  * Find snapshot artifacts in the repository that are considered old.
  *
- * @plexus.component role="org.apache.maven.archiva.reporting.ArtifactReportProcessor" role-hint="old-snapshot-artifact"
+ * @plexus.component role="org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor" role-hint="old-snapshot-artifact"
  * @todo make this configurable from the web interface
  */
 public class OldSnapshotArtifactReportProcessor

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/store/DefaultReportingStore.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.store;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -19,6 +19,10 @@ package org.apache.maven.archiva.reporting;
 import org.apache.maven.archiva.reporting.model.Reporting;
 import org.apache.maven.archiva.reporting.model.io.xpp3.ReportingXpp3Reader;
 import org.apache.maven.archiva.reporting.model.io.xpp3.ReportingXpp3Writer;
+import org.apache.maven.archiva.reporting.group.ReportGroup;
+import org.apache.maven.archiva.reporting.store.ReportingStore;
+import org.apache.maven.archiva.reporting.store.ReportingStoreException;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.IOUtil;

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/store/ReportingStore.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.store;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -17,6 +17,9 @@ package org.apache.maven.archiva.reporting;
  */
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.archiva.reporting.group.ReportGroup;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
+import org.apache.maven.archiva.reporting.store.ReportingStoreException;
 
 /**
  * A component for loading the reporting database into the model.

archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/store/ReportingStoreException.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.store;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.

archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/BadMetadataReportProcessorTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.processor;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -18,6 +18,10 @@ package org.apache.maven.archiva.reporting;
 
 import org.apache.maven.archiva.reporting.model.MetadataResults;
 import org.apache.maven.archiva.reporting.model.Result;
+import org.apache.maven.archiva.reporting.group.ReportGroup;
+import org.apache.maven.archiva.reporting.processor.MetadataReportProcessor;
+import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;

archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DependencyArtifactReportProcessorTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.processor;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -18,6 +18,11 @@ package org.apache.maven.archiva.reporting;
 
 import org.apache.maven.archiva.reporting.model.ArtifactResults;
 import org.apache.maven.archiva.reporting.model.Result;
+import org.apache.maven.archiva.reporting.group.ReportGroup;
+import org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor;
+import org.apache.maven.archiva.reporting.processor.DependencyArtifactReportProcessor;
+import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.model.Dependency;

archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.processor;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -19,6 +19,10 @@ package org.apache.maven.archiva.reporting;
 import org.apache.maven.archiva.indexer.RepositoryArtifactIndex;
 import org.apache.maven.archiva.indexer.RepositoryArtifactIndexFactory;
 import org.apache.maven.archiva.indexer.record.RepositoryIndexRecordFactory;
+import org.apache.maven.archiva.reporting.group.ReportGroup;
+import org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor;
+import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.model.Model;
@@ -55,6 +59,7 @@ public class DuplicateArtifactFileReportProcessorTest
 
         artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
         artifact = createArtifact( "groupId", "artifactId", "1.0-alpha-1", "1.0-alpha-1", "jar" );
+        System.out.println( "artifact = " + artifact );
         model = new Model();
 
         RepositoryArtifactIndexFactory factory =

archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/InvalidPomArtifactReportProcessorTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.processor;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -17,6 +17,10 @@ package org.apache.maven.archiva.reporting;
  */
 
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.archiva.reporting.group.ReportGroup;
+import org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor;
+import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 
 /**
  * This class tests the InvalidPomArtifactReportProcessor class.

archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/LocationArtifactReportProcessorTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.processor;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -19,6 +19,10 @@ package org.apache.maven.archiva.reporting;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.archiva.reporting.group.ReportGroup;
+import org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor;
+import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 import java.io.File;

archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.processor;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -18,6 +18,10 @@ package org.apache.maven.archiva.reporting;
 
 import org.apache.maven.archiva.reporting.model.ArtifactResults;
 import org.apache.maven.archiva.reporting.model.Result;
+import org.apache.maven.archiva.reporting.group.ReportGroup;
+import org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor;
+import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 import org.apache.maven.artifact.Artifact;
 import org.codehaus.plexus.util.FileUtils;
 

archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.processor;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -18,6 +18,10 @@ package org.apache.maven.archiva.reporting;
 
 import org.apache.maven.archiva.reporting.model.ArtifactResults;
 import org.apache.maven.archiva.reporting.model.Result;
+import org.apache.maven.archiva.reporting.group.ReportGroup;
+import org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor;
+import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 import org.apache.maven.artifact.Artifact;
 import org.codehaus.plexus.util.FileUtils;
 

archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/AbstractChecksumArtifactReporterTestCase.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.reporter;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -20,6 +20,7 @@ import org.codehaus.plexus.digest.Digester;
 import org.codehaus.plexus.digest.DigesterException;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
+import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;

archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/ChecksumArtifactReporterTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.reporter;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -17,6 +17,11 @@ package org.apache.maven.archiva.reporting;
  */
 
 import org.apache.maven.archiva.reporting.model.MetadataResults;
+import org.apache.maven.archiva.reporting.group.ReportGroup;
+import org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor;
+import org.apache.maven.archiva.reporting.processor.MetadataReportProcessor;
+import org.apache.maven.archiva.reporting.reporter.AbstractChecksumArtifactReporterTestCase;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
 import org.apache.maven.artifact.repository.metadata.GroupRepositoryMetadata;

archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/DefaultArtifactReporterTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.reporting;
+package org.apache.maven.archiva.reporting.reporter;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -19,6 +19,9 @@ package org.apache.maven.archiva.reporting;
 import org.apache.maven.archiva.reporting.model.ArtifactResults;
 import org.apache.maven.archiva.reporting.model.MetadataResults;
 import org.apache.maven.archiva.reporting.model.Result;
+import org.apache.maven.archiva.reporting.group.ReportGroup;
+import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
+import org.apache.maven.archiva.reporting.database.ReportingDatabase;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;

archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.xml

@@ -18,9 +18,9 @@
 <component-set>
   <components>
     <component>
-      <role>org.apache.maven.archiva.reporting.ArtifactReportProcessor</role>
+      <role>org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor</role>
       <role-hint>duplicate</role-hint>
-      <implementation>org.apache.maven.archiva.reporting.DuplicateArtifactFileReportProcessor</implementation>
+      <implementation>org.apache.maven.archiva.reporting.processor.DuplicateArtifactFileReportProcessor</implementation>
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.digest.Digester</role>

archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.xml

@@ -18,9 +18,9 @@
 <component-set>
   <components>
     <component>
-      <role>org.apache.maven.archiva.reporting.ArtifactReportProcessor</role>
+      <role>org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor</role>
       <role-hint>old-artifact</role-hint>
-      <implementation>org.apache.maven.archiva.reporting.OldArtifactReportProcessor</implementation>
+      <implementation>org.apache.maven.archiva.reporting.processor.OldArtifactReportProcessor</implementation>
       <configuration>
         <maxAge>10</maxAge>
       </configuration>

archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.xml

@@ -18,9 +18,9 @@
 <component-set>
   <components>
     <component>
-      <role>org.apache.maven.archiva.reporting.ArtifactReportProcessor</role>
+      <role>org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor</role>
       <role-hint>old-snapshot-artifact</role-hint>
-      <implementation>org.apache.maven.archiva.reporting.OldSnapshotArtifactReportProcessor</implementation>
+      <implementation>org.apache.maven.archiva.reporting.processor.OldSnapshotArtifactReportProcessor</implementation>
       <configuration>
         <maxAge>3600</maxAge>
         <maxSnapshots>2</maxSnapshots>