From 37317c17e4e18d43380711c01fc129ae1ad4e922 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Sat, 2 Dec 2006 00:07:57 +0000 Subject: [PATCH] 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 --- .../reporting/{ => database}/ReportingDatabase.java | 3 ++- .../{ => executor}/DefaultReportExecutor.java | 7 ++++++- .../reporting/{ => executor}/ReportExecutor.java | 7 +++++-- .../{ => filter}/ReportingMetadataFilter.java | 3 ++- .../reporting/{ => group}/AbstractReportGroup.java | 10 +++++++--- .../reporting/{ => group}/DefaultReportGroup.java | 6 ++++-- .../{ => group}/OldArtifactReportGroup.java | 6 ++++-- .../archiva/reporting/{ => group}/ReportGroup.java | 3 ++- .../{ => processor}/ArtifactReportProcessor.java | 3 ++- .../{ => processor}/BadMetadataReportProcessor.java | 8 +++++--- .../ChecksumArtifactReportProcessor.java | 6 ++++-- .../ChecksumMetadataReportProcessor.java | 6 ++++-- .../DependencyArtifactReportProcessor.java | 6 ++++-- .../DuplicateArtifactFileReportProcessor.java | 12 +++++++++--- .../InvalidPomArtifactReportProcessor.java | 6 ++++-- .../LocationArtifactReportProcessor.java | 6 ++++-- .../{ => processor}/MetadataReportProcessor.java | 3 ++- .../{ => processor}/OldArtifactReportProcessor.java | 6 ++++-- .../OldSnapshotArtifactReportProcessor.java | 6 ++++-- .../reporting/{ => store}/DefaultReportingStore.java | 6 +++++- .../reporting/{ => store}/ReportingStore.java | 5 ++++- .../{ => store}/ReportingStoreException.java | 2 +- .../BadMetadataReportProcessorTest.java | 6 +++++- .../DependencyArtifactReportProcessorTest.java | 7 ++++++- .../DuplicateArtifactFileReportProcessorTest.java | 7 ++++++- .../InvalidPomArtifactReportProcessorTest.java | 6 +++++- .../LocationArtifactReportProcessorTest.java | 6 +++++- .../OldArtifactReportProcessorTest.java | 6 +++++- .../OldSnapshotArtifactReportProcessorTest.java | 6 +++++- .../AbstractChecksumArtifactReporterTestCase.java | 3 ++- .../{ => reporter}/ChecksumArtifactReporterTest.java | 7 ++++++- .../{ => reporter}/DefaultArtifactReporterTest.java | 5 ++++- .../DuplicateArtifactFileReportProcessorTest.xml | 4 ++-- .../OldArtifactReportProcessorTest.xml | 4 ++-- .../OldSnapshotArtifactReportProcessorTest.xml | 4 ++-- 35 files changed, 143 insertions(+), 54 deletions(-) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => database}/ReportingDatabase.java (99%) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => executor}/DefaultReportExecutor.java (95%) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => executor}/ReportExecutor.java (89%) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => filter}/ReportingMetadataFilter.java (91%) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => group}/AbstractReportGroup.java (85%) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => group}/DefaultReportGroup.java (90%) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => group}/OldArtifactReportGroup.java (86%) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => group}/ReportGroup.java (95%) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => processor}/ArtifactReportProcessor.java (89%) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => processor}/BadMetadataReportProcessor.java (97%) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => processor}/ChecksumArtifactReportProcessor.java (91%) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => processor}/ChecksumMetadataReportProcessor.java (92%) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => processor}/DependencyArtifactReportProcessor.java (94%) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => processor}/DuplicateArtifactFileReportProcessor.java (90%) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => processor}/InvalidPomArtifactReportProcessor.java (91%) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => processor}/LocationArtifactReportProcessor.java (96%) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => processor}/MetadataReportProcessor.java (89%) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => processor}/OldArtifactReportProcessor.java (90%) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => processor}/OldSnapshotArtifactReportProcessor.java (95%) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => store}/DefaultReportingStore.java (93%) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => store}/ReportingStore.java (88%) rename archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/{ => store}/ReportingStoreException.java (95%) rename archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/{ => processor}/BadMetadataReportProcessorTest.java (98%) rename archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/{ => processor}/DependencyArtifactReportProcessorTest.java (96%) rename archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/{ => processor}/DuplicateArtifactFileReportProcessorTest.java (93%) rename archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/{ => processor}/InvalidPomArtifactReportProcessorTest.java (89%) rename archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/{ => processor}/LocationArtifactReportProcessorTest.java (96%) rename archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/{ => processor}/OldArtifactReportProcessorTest.java (91%) rename archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/{ => processor}/OldSnapshotArtifactReportProcessorTest.java (95%) rename archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/{ => reporter}/AbstractChecksumArtifactReporterTestCase.java (98%) rename archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/{ => reporter}/ChecksumArtifactReporterTest.java (93%) rename archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/{ => reporter}/DefaultArtifactReporterTest.java (98%) rename archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/{ => processor}/DuplicateArtifactFileReportProcessorTest.xml (84%) rename archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/{ => processor}/OldArtifactReportProcessorTest.xml (80%) rename archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/{ => processor}/OldSnapshotArtifactReportProcessorTest.xml (80%) diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportingDatabase.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/ReportingDatabase.java similarity index 99% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportingDatabase.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/ReportingDatabase.java index 78ae3c380..b00982570 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportingDatabase.java +++ b/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; diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultReportExecutor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/executor/DefaultReportExecutor.java similarity index 95% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultReportExecutor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/executor/DefaultReportExecutor.java index 81256c6fb..ca95295d1 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultReportExecutor.java +++ b/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; diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportExecutor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/executor/ReportExecutor.java similarity index 89% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportExecutor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/executor/ReportExecutor.java index 07da5bcb9..fb99ad741 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportExecutor.java +++ b/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; diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportingMetadataFilter.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/filter/ReportingMetadataFilter.java similarity index 91% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportingMetadataFilter.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/filter/ReportingMetadataFilter.java index 9ef876cf3..6a7b89f3b 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportingMetadataFilter.java +++ b/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; /** diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/AbstractReportGroup.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/group/AbstractReportGroup.java similarity index 85% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/AbstractReportGroup.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/group/AbstractReportGroup.java index d0bd7ce24..25139b9b4 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/AbstractReportGroup.java +++ b/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; diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultReportGroup.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/group/DefaultReportGroup.java similarity index 90% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultReportGroup.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/group/DefaultReportGroup.java index 3f80c2809..1a0d9edc8 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultReportGroup.java +++ b/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 diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/OldArtifactReportGroup.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/group/OldArtifactReportGroup.java similarity index 86% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/OldArtifactReportGroup.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/group/OldArtifactReportGroup.java index d41dc962b..0a6fae928 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/OldArtifactReportGroup.java +++ b/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 diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportGroup.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/group/ReportGroup.java similarity index 95% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportGroup.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/group/ReportGroup.java index 50a5a4bab..8cb408dc9 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportGroup.java +++ b/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; diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/ArtifactReportProcessor.java similarity index 89% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ArtifactReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/ArtifactReportProcessor.java index 8667821dc..8413cb73f 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ArtifactReportProcessor.java +++ b/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 diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/BadMetadataReportProcessor.java similarity index 97% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/BadMetadataReportProcessor.java index dfc5190cf..7aae729ac 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessor.java +++ b/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 diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/ChecksumArtifactReportProcessor.java similarity index 91% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumArtifactReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/ChecksumArtifactReportProcessor.java index 245ccfd60..5dc3e2645 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumArtifactReportProcessor.java +++ b/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 diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumMetadataReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/ChecksumMetadataReportProcessor.java similarity index 92% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumMetadataReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/ChecksumMetadataReportProcessor.java index 0361d9928..81a558e8b 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumMetadataReportProcessor.java +++ b/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 diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/DependencyArtifactReportProcessor.java similarity index 94% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/DependencyArtifactReportProcessor.java index c62b2f16f..2ed20aa8c 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessor.java +++ b/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 diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessor.java similarity index 90% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessor.java index a05062d88..a5f884633 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessor.java +++ b/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 diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/InvalidPomArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/InvalidPomArtifactReportProcessor.java similarity index 91% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/InvalidPomArtifactReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/InvalidPomArtifactReportProcessor.java index 3ed924661..19107c20c 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/InvalidPomArtifactReportProcessor.java +++ b/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 diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/LocationArtifactReportProcessor.java similarity index 96% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/LocationArtifactReportProcessor.java index 2b03592cb..c297e1c14 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessor.java +++ b/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 diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/MetadataReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/MetadataReportProcessor.java similarity index 89% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/MetadataReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/MetadataReportProcessor.java index d043a26ef..12f57e91d 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/MetadataReportProcessor.java +++ b/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. diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/OldArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessor.java similarity index 90% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/OldArtifactReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessor.java index ffd679106..8df0f706e 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/OldArtifactReportProcessor.java +++ b/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 diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/OldSnapshotArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessor.java similarity index 95% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/OldSnapshotArtifactReportProcessor.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessor.java index b6e10ee34..b067e6c56 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/OldSnapshotArtifactReportProcessor.java +++ b/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 diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultReportingStore.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/store/DefaultReportingStore.java similarity index 93% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultReportingStore.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/store/DefaultReportingStore.java index 768fd5e9f..d1c1f5552 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultReportingStore.java +++ b/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; diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportingStore.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/store/ReportingStore.java similarity index 88% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportingStore.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/store/ReportingStore.java index 8f52a5c86..b2517363a 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportingStore.java +++ b/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. diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportingStoreException.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/store/ReportingStoreException.java similarity index 95% rename from archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportingStoreException.java rename to archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/store/ReportingStoreException.java index 5e797e46b..84d6a3b5c 100644 --- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportingStoreException.java +++ b/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. diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/BadMetadataReportProcessorTest.java similarity index 98% rename from archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessorTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/BadMetadataReportProcessorTest.java index cd9400a31..453d07b21 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessorTest.java +++ b/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; diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DependencyArtifactReportProcessorTest.java similarity index 96% rename from archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessorTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DependencyArtifactReportProcessorTest.java index 50e58fda0..4800e22d2 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessorTest.java +++ b/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; diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.java similarity index 93% rename from archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.java index 3ad4bad88..5f8e39dae 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.java +++ b/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 = diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/InvalidPomArtifactReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/InvalidPomArtifactReportProcessorTest.java similarity index 89% rename from archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/InvalidPomArtifactReportProcessorTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/InvalidPomArtifactReportProcessorTest.java index afea3474a..07ac2a06c 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/InvalidPomArtifactReportProcessorTest.java +++ b/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. diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/LocationArtifactReportProcessorTest.java similarity index 96% rename from archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessorTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/LocationArtifactReportProcessorTest.java index 3b6f6dfd9..9d3e99776 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessorTest.java +++ b/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; diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/OldArtifactReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.java similarity index 91% rename from archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/OldArtifactReportProcessorTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.java index f1c5073d9..95d3c90eb 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/OldArtifactReportProcessorTest.java +++ b/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; diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/OldSnapshotArtifactReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.java similarity index 95% rename from archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/OldSnapshotArtifactReportProcessorTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.java index 93c7de65f..55a5be32c 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/OldSnapshotArtifactReportProcessorTest.java +++ b/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; diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractChecksumArtifactReporterTestCase.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/AbstractChecksumArtifactReporterTestCase.java similarity index 98% rename from archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractChecksumArtifactReporterTestCase.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/AbstractChecksumArtifactReporterTestCase.java index e7148fdf5..4974d8b39 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractChecksumArtifactReporterTestCase.java +++ b/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; diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ChecksumArtifactReporterTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/ChecksumArtifactReporterTest.java similarity index 93% rename from archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ChecksumArtifactReporterTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/ChecksumArtifactReporterTest.java index 0830448ff..5a9ac7422 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ChecksumArtifactReporterTest.java +++ b/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; diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DefaultArtifactReporterTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/DefaultArtifactReporterTest.java similarity index 98% rename from archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DefaultArtifactReporterTest.java rename to archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/DefaultArtifactReporterTest.java index 07d44fdfe..e7d955d64 100644 --- a/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DefaultArtifactReporterTest.java +++ b/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; diff --git a/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml b/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.xml similarity index 84% rename from archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml rename to archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.xml index bda4e9aca..5cef19714 100644 --- a/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml +++ b/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.xml @@ -18,9 +18,9 @@ - org.apache.maven.archiva.reporting.ArtifactReportProcessor + org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor duplicate - org.apache.maven.archiva.reporting.DuplicateArtifactFileReportProcessor + org.apache.maven.archiva.reporting.processor.DuplicateArtifactFileReportProcessor org.codehaus.plexus.digest.Digester diff --git a/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldArtifactReportProcessorTest.xml b/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.xml similarity index 80% rename from archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldArtifactReportProcessorTest.xml rename to archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.xml index 34b01e482..0f9493bef 100644 --- a/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldArtifactReportProcessorTest.xml +++ b/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.xml @@ -18,9 +18,9 @@ - org.apache.maven.archiva.reporting.ArtifactReportProcessor + org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor old-artifact - org.apache.maven.archiva.reporting.OldArtifactReportProcessor + org.apache.maven.archiva.reporting.processor.OldArtifactReportProcessor 10 diff --git a/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldSnapshotArtifactReportProcessorTest.xml b/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.xml similarity index 80% rename from archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldSnapshotArtifactReportProcessorTest.xml rename to archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.xml index 1f7cfcecd..0cf6183cd 100644 --- a/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldSnapshotArtifactReportProcessorTest.xml +++ b/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.xml @@ -18,9 +18,9 @@ - org.apache.maven.archiva.reporting.ArtifactReportProcessor + org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor old-snapshot-artifact - org.apache.maven.archiva.reporting.OldSnapshotArtifactReportProcessor + org.apache.maven.archiva.reporting.processor.OldSnapshotArtifactReportProcessor 3600 2 -- 2.39.5