rename java packages to archiva

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

43 files changed, 86 insertions, 81 deletions

diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayer.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/AbstractRepositoryQueryLayer.java
index 997597c77..8d9bc6e3e 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayer.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/AbstractRepositoryQueryLayer.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ArtifactReportProcessor.java
index 773b2c7f5..0379626d1 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReportProcessor.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ArtifactReportProcessor.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReporter.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ArtifactReporter.java
index a48476491..af5b539d8 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReporter.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ArtifactReporter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactResult.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ArtifactResult.java
index 6c0aba900..d3685c29a 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactResult.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ArtifactResult.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/BadMetadataReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessor.java
index fdba18d39..919940c80 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/BadMetadataReportProcessor.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessor.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -38,7 +38,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.repository.reporting.MetadataReportProcessor" role-hint="bad-metadata"
+ * @plexus.component role="org.apache.maven.archiva.reporting.MetadataReportProcessor" role-hint="bad-metadata"
  */
 public class BadMetadataReportProcessor
     implements MetadataReportProcessor
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/Cache.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/Cache.java
index 8f695f91d..2559cf2e2 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/Cache.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/Cache.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayer.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/CachedRepositoryQueryLayer.java
index b0c1eac27..7b455899a 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayer.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/CachedRepositoryQueryLayer.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumArtifactReporter.java
index 51b4a8772..ef23c9226 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumArtifactReporter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,11 +16,11 @@ package org.apache.maven.repository.reporting;
  * limitations under the License.
  */
 
+import org.apache.maven.archiva.digest.Digester;
+import org.apache.maven.archiva.digest.DigesterException;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.model.Model;
-import org.apache.maven.repository.digest.Digester;
-import org.apache.maven.repository.digest.DigesterException;
 import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
@@ -30,7 +30,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.repository.reporting.ArtifactReportProcessor" role-hint="checksum"
+ * @plexus.component role="org.apache.maven.archiva.reporting.ArtifactReportProcessor" role-hint="checksum"
  */
 public class ChecksumArtifactReporter
     implements ArtifactReportProcessor
@@ -44,7 +44,7 @@ public class ChecksumArtifactReporter
      * @plexus.requirement role-hint="md5"
      */
     private Digester md5Digester;
-    
+
     /**
      * Validate the checksum of the specified artifact.
      *
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumMetadataReporter.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumMetadataReporter.java
index df732f656..2e2f41a04 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumMetadataReporter.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumMetadataReporter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,10 +16,10 @@ package org.apache.maven.repository.reporting;
  * limitations under the License.
  */
 
+import org.apache.maven.archiva.digest.Digester;
+import org.apache.maven.archiva.digest.DigesterException;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
-import org.apache.maven.repository.digest.Digester;
-import org.apache.maven.repository.digest.DigesterException;
 import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
@@ -29,7 +29,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.repository.reporting.MetadataReportProcessor" role-hint="checksum-metadata"
+ * @plexus.component role="org.apache.maven.archiva.reporting.MetadataReportProcessor" role-hint="checksum-metadata"
  */
 public class ChecksumMetadataReporter
     implements MetadataReportProcessor
@@ -43,7 +43,7 @@ public class ChecksumMetadataReporter
      * @plexus.requirement role-hint="md5"
      */
     private Digester md5Digester;
-    
+
     /**
      * Validate the checksums of the metadata. Get the metadata file from the
      * repository then validate the checksum.
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultArtifactReportProcessor.java
index b869e7e49..040113af6 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReportProcessor.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultArtifactReportProcessor.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -26,7 +26,7 @@ import java.util.Iterator;
 import java.util.List;
 
 /**
- * @plexus.component role="org.apache.maven.repository.reporting.ArtifactReportProcessor" role-hint="default"
+ * @plexus.component role="org.apache.maven.archiva.reporting.ArtifactReportProcessor" role-hint="default"
  */
 public class DefaultArtifactReportProcessor
     implements ArtifactReportProcessor
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReporter.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultArtifactReporter.java
index 32b4cd755..9d944a86f 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReporter.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultArtifactReporter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -24,7 +24,7 @@ import java.util.Iterator;
 import java.util.List;
 
 /**
- * @plexus.component role="org.apache.maven.repository.reporting.ArtifactReporter" role-hint="default"
+ * @plexus.component role="org.apache.maven.archiva.reporting.ArtifactReporter" role-hint="default"
  */
 public class DefaultArtifactReporter
     implements ArtifactReporter
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayer.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultRepositoryQueryLayer.java
index 5570666dd..4b000fbe6 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayer.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultRepositoryQueryLayer.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayerFactory.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultRepositoryQueryLayerFactory.java
index 56f9826dc..ec607b6f1 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayerFactory.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DefaultRepositoryQueryLayerFactory.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -23,7 +23,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  * @version $Id$
- * @plexus.component role="org.apache.maven.repository.reporting.RepositoryQueryLayerFactory"
+ * @plexus.component role="org.apache.maven.archiva.reporting.RepositoryQueryLayerFactory"
  */
 public class DefaultRepositoryQueryLayerFactory
     implements RepositoryQueryLayerFactory
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessor.java
index df8c81a85..89f393d2b 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessor.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessor.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,29 +16,29 @@ package org.apache.maven.repository.reporting;
  * limitations under the License.
  */
 
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.TermQuery;
+import org.apache.maven.archiva.digest.Digester;
+import org.apache.maven.archiva.digest.DigesterException;
+import org.apache.maven.archiva.indexing.RepositoryArtifactIndex;
+import org.apache.maven.archiva.indexing.RepositoryArtifactIndexFactory;
+import org.apache.maven.archiva.indexing.RepositoryIndexSearchException;
+import org.apache.maven.archiva.indexing.lucene.LuceneQuery;
+import org.apache.maven.archiva.indexing.record.StandardArtifactIndexRecord;
+import org.apache.maven.archiva.indexing.record.StandardIndexRecordFields;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.model.Model;
-import org.apache.maven.repository.digest.Digester;
-import org.apache.maven.repository.digest.DigesterException;
-import org.apache.maven.repository.indexing.RepositoryArtifactIndex;
-import org.apache.maven.repository.indexing.RepositoryArtifactIndexFactory;
-import org.apache.maven.repository.indexing.RepositoryIndexSearchException;
-import org.apache.maven.repository.indexing.lucene.LuceneQuery;
-import org.apache.maven.repository.indexing.record.StandardArtifactIndexRecord;
-import org.apache.maven.repository.indexing.record.StandardIndexRecordFields;
+
+import java.io.File;
+import java.util.Iterator;
+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.repository.reporting.ArtifactReportProcessor" role-hint="duplicate"
+ * @plexus.component role="org.apache.maven.archiva.reporting.ArtifactReportProcessor" role-hint="duplicate"
  */
 public class DuplicateArtifactFileReportProcessor
     implements ArtifactReportProcessor
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/InvalidPomArtifactReportProcessor.java
index a11f35754..eeb5a6b4b 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessor.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/InvalidPomArtifactReportProcessor.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -32,7 +32,7 @@ import java.io.Reader;
 /**
  * This class validates well-formedness of pom xml file.
  *
- * @plexus.component role="org.apache.maven.repository.reporting.ArtifactReportProcessor" role-hint="invalid-pom"
+ * @plexus.component role="org.apache.maven.archiva.reporting.ArtifactReportProcessor" role-hint="invalid-pom"
  */
 public class InvalidPomArtifactReportProcessor
     implements ArtifactReportProcessor
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessor.java
index 140425656..e49ef8298 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessor.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessor.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -36,12 +36,15 @@ import java.util.jar.JarFile;
  * Validate the location of the artifact based on the values indicated
  * in its pom (both the pom packaged with the artifact & the pom in the
  * file system).
- * @plexus.component role="org.apache.maven.repository.reporting.ArtifactReportProcessor" role-hint="artifact-location"
+ *
+ * @plexus.component role="org.apache.maven.archiva.reporting.ArtifactReportProcessor" role-hint="artifact-location"
  */
 public class LocationArtifactReportProcessor
     implements ArtifactReportProcessor
 {
-    /** @plexus.requirement */
+    /**
+     * @plexus.requirement
+     */
     private ArtifactFactory artifactFactory;
 
     /**
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/MetadataReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/MetadataReportProcessor.java
index 0431a8adf..712cb260e 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/MetadataReportProcessor.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/MetadataReportProcessor.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ReportProcessorException.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportProcessorException.java
index 5f73dbdc0..783f888c6 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ReportProcessorException.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportProcessorException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryMetadataResult.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryMetadataResult.java
index 4c962986a..1c84623a9 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryMetadataResult.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryMetadataResult.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayer.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryQueryLayer.java
index 950f7a252..19a7956dd 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayer.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryQueryLayer.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -30,7 +30,9 @@ public interface RepositoryQueryLayer
 
     boolean containsArtifact( Artifact artifact );
 
-    /** @todo I believe we can remove this [BP] - artifact should contain all the necessary version info */
+    /**
+     * @todo I believe we can remove this [BP] - artifact should contain all the necessary version info
+     */
     boolean containsArtifact( Artifact artifact, Snapshot snapshot );
 
     List getVersions( Artifact artifact )
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerException.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryQueryLayerException.java
index ae7f77947..a95415398 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerException.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryQueryLayerException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerFactory.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryQueryLayerFactory.java
index 00f42b30d..e69527b5e 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerFactory.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/RepositoryQueryLayerFactory.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTestCase.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractChecksumArtifactReporterTestCase.java
index 93b9b2e6e..a7e6a764f 100644
--- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTestCase.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractChecksumArtifactReporterTestCase.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,8 +16,8 @@ package org.apache.maven.repository.reporting;
  * limitations under the License.
  */
 
-import org.apache.maven.repository.digest.Digester;
-import org.apache.maven.repository.digest.DigesterException;
+import org.apache.maven.archiva.digest.Digester;
+import org.apache.maven.archiva.digest.DigesterException;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
 
diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayerTestCase.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractRepositoryQueryLayerTestCase.java
index 6de998c8f..0774095d5 100644
--- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayerTestCase.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractRepositoryQueryLayerTestCase.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryReportsTestCase.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractRepositoryReportsTestCase.java
index 45f12964e..f56d82e94 100644
--- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryReportsTestCase.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractRepositoryReportsTestCase.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ArtifactReportProcessorTest.java
index 4d6c697f3..17b4723fd 100644
--- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReportProcessorTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ArtifactReportProcessorTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReporterTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ArtifactReporterTest.java
index e3fc97f6b..e6a7e9ad5 100644
--- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReporterTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ArtifactReporterTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/BadMetadataReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessorTest.java
index 828b27274..4a189b62a 100644
--- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/BadMetadataReportProcessorTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessorTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/CacheTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/CacheTest.java
index cfc83b309..123e92f30 100644
--- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/CacheTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/CacheTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayerTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/CachedRepositoryQueryLayerTest.java
index 11c0b8e95..44e3d3108 100644
--- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayerTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/CachedRepositoryQueryLayerTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ChecksumArtifactReporterTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ChecksumArtifactReporterTest.java
index 64585c52d..1cc7d12dd 100644
--- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ChecksumArtifactReporterTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ChecksumArtifactReporterTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,6 +16,7 @@ package org.apache.maven.repository.reporting;
  * limitations under the License.
  */
 
+import org.apache.maven.archiva.digest.DigesterException;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.DefaultArtifact;
 import org.apache.maven.artifact.handler.ArtifactHandler;
@@ -25,7 +26,6 @@ import org.apache.maven.artifact.repository.metadata.GroupRepositoryMetadata;
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
 import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
 import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.repository.digest.DigesterException;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/DefaultArtifactReporterTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DefaultArtifactReporterTest.java
index ac19ab3e0..fb4bb274f 100644
--- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/DefaultArtifactReporterTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DefaultArtifactReporterTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.java
index 31dec3015..3491e5cc5 100644
--- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,12 +16,12 @@ package org.apache.maven.repository.reporting;
  * limitations under the License.
  */
 
+import org.apache.maven.archiva.indexing.RepositoryArtifactIndex;
+import org.apache.maven.archiva.indexing.RepositoryArtifactIndexFactory;
+import org.apache.maven.archiva.indexing.record.RepositoryIndexRecordFactory;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.model.Model;
-import org.apache.maven.repository.indexing.RepositoryArtifactIndex;
-import org.apache.maven.repository.indexing.RepositoryArtifactIndexFactory;
-import org.apache.maven.repository.indexing.record.RepositoryIndexRecordFactory;
 import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/GenericMockObject.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/GenericMockObject.java
index 7ab3de250..8e8a49c15 100644
--- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/GenericMockObject.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/GenericMockObject.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/InvalidPomArtifactReportProcessorTest.java
index 71c53d8bd..fd1fe91b3 100644
--- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessorTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/InvalidPomArtifactReportProcessorTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessorTest.java
index d892dd3a6..ddd83a7a2 100644
--- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessorTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessorTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockArtifact.java
index a9f3cd3f2..9e4482137 100644
--- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockArtifact.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockArtifactFactory.java
index 7bdc708a9..bf4cb5382 100644
--- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockArtifactFactory.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReportProcessor.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockArtifactReportProcessor.java
index 00bdc23ae..54697973f 100644
--- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReportProcessor.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockArtifactReportProcessor.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReporter.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockArtifactReporter.java
index f13e660cf..0666b95c6 100755
--- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReporter.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockArtifactReporter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockRepositoryQueryLayer.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockRepositoryQueryLayer.java
index e6ec4eef3..6657a29a0 100644
--- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockRepositoryQueryLayer.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/MockRepositoryQueryLayer.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ReportCondition.java b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ReportCondition.java
index 98df89646..fcabbbd78 100644
--- a/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ReportCondition.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ReportCondition.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.reporting;
+package org.apache.maven.archiva.reporting;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-reports-standard/src/test/resources/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.xml b/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml
index d8b910c2e..e1311bb8b 100644
--- a/archiva-reports-standard/src/test/resources/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.xml
+++ b/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml
@@ -1,16 +1,16 @@
 <component-set>
   <components>
     <component>
-      <role>org.apache.maven.repository.reporting.ArtifactReportProcessor</role>
+      <role>org.apache.maven.archiva.reporting.ArtifactReportProcessor</role>
       <role-hint>duplicate</role-hint>
-      <implementation>org.apache.maven.repository.reporting.DuplicateArtifactFileReportProcessor</implementation>
+      <implementation>org.apache.maven.archiva.reporting.DuplicateArtifactFileReportProcessor</implementation>
       <requirements>
         <requirement>
-          <role>org.apache.maven.repository.digest.Digester</role>
+          <role>org.apache.maven.archiva.digest.Digester</role>
           <role-hint>md5</role-hint>
         </requirement>
         <requirement>
-          <role>org.apache.maven.repository.indexing.RepositoryArtifactIndexFactory</role>
+          <role>org.apache.maven.archiva.indexing.RepositoryArtifactIndexFactory</role>
         </requirement>
       </requirements>
       <configuration>