rename java packages to archiva

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

50 files changed, 135 insertions, 135 deletions

diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndex.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryArtifactIndex.java
index 03803ed53..b02ce2884 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndex.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryArtifactIndex.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing;
+package org.apache.maven.archiva.indexing;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,7 +16,7 @@ package org.apache.maven.repository.indexing;
  * limitations under the License.
  */
 
-import org.apache.maven.repository.indexing.query.Query;
+import org.apache.maven.archiva.indexing.query.Query;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndexFactory.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryArtifactIndexFactory.java
index ed0100527..df9f08d55 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndexFactory.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryArtifactIndexFactory.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing;
+package org.apache.maven.archiva.indexing;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexException.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryIndexException.java
index fe16c022c..b44560777 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexException.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryIndexException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing;
+package org.apache.maven.archiva.indexing;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearchException.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryIndexSearchException.java
index cd84bde19..590efb66e 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearchException.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryIndexSearchException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing;
+package org.apache.maven.archiva.indexing;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneIndexRecordConverter.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneIndexRecordConverter.java
index 7aaf123e3..225862910 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneIndexRecordConverter.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneIndexRecordConverter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.lucene;
+package org.apache.maven.archiva.indexing.lucene;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -17,7 +17,7 @@ package org.apache.maven.repository.indexing.lucene;
  */
 
 import org.apache.lucene.document.Document;
-import org.apache.maven.repository.indexing.record.RepositoryIndexRecord;
+import org.apache.maven.archiva.indexing.record.RepositoryIndexRecord;
 
 import java.text.ParseException;
 
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalIndexRecordConverter.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneMinimalIndexRecordConverter.java
index 02def2dbd..d67b4bfaf 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalIndexRecordConverter.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneMinimalIndexRecordConverter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.lucene;
+package org.apache.maven.archiva.indexing.lucene;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -20,9 +20,9 @@ import org.apache.lucene.document.DateTools;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.NumberTools;
-import org.apache.maven.repository.indexing.record.MinimalArtifactIndexRecord;
-import org.apache.maven.repository.indexing.record.MinimalIndexRecordFields;
-import org.apache.maven.repository.indexing.record.RepositoryIndexRecord;
+import org.apache.maven.archiva.indexing.record.MinimalArtifactIndexRecord;
+import org.apache.maven.archiva.indexing.record.MinimalIndexRecordFields;
+import org.apache.maven.archiva.indexing.record.RepositoryIndexRecord;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.text.ParseException;
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneQuery.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneQuery.java
index 13fdcaf5c..63c665913 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneQuery.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneQuery.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.lucene;
+package org.apache.maven.archiva.indexing.lucene;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,7 +16,7 @@ package org.apache.maven.repository.indexing.lucene;
  * limitations under the License.
  */
 
-import org.apache.maven.repository.indexing.query.Query;
+import org.apache.maven.archiva.indexing.query.Query;
 
 /**
  * A holder for a lucene query to pass to the indexer API.
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndex.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneRepositoryArtifactIndex.java
index dff648ec5..12803681d 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndex.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneRepositoryArtifactIndex.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.lucene;
+package org.apache.maven.archiva.indexing.lucene;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -25,11 +25,11 @@ import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.Hits;
 import org.apache.lucene.search.IndexSearcher;
-import org.apache.maven.repository.indexing.RepositoryArtifactIndex;
-import org.apache.maven.repository.indexing.RepositoryIndexException;
-import org.apache.maven.repository.indexing.RepositoryIndexSearchException;
-import org.apache.maven.repository.indexing.query.Query;
-import org.apache.maven.repository.indexing.record.RepositoryIndexRecord;
+import org.apache.maven.archiva.indexing.RepositoryArtifactIndex;
+import org.apache.maven.archiva.indexing.RepositoryIndexException;
+import org.apache.maven.archiva.indexing.RepositoryIndexSearchException;
+import org.apache.maven.archiva.indexing.query.Query;
+import org.apache.maven.archiva.indexing.record.RepositoryIndexRecord;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndexFactory.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneRepositoryArtifactIndexFactory.java
index 97278b009..42b23c475 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndexFactory.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneRepositoryArtifactIndexFactory.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.lucene;
+package org.apache.maven.archiva.indexing.lucene;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,8 +16,8 @@ package org.apache.maven.repository.indexing.lucene;
  * limitations under the License.
  */
 
-import org.apache.maven.repository.indexing.RepositoryArtifactIndex;
-import org.apache.maven.repository.indexing.RepositoryArtifactIndexFactory;
+import org.apache.maven.archiva.indexing.RepositoryArtifactIndex;
+import org.apache.maven.archiva.indexing.RepositoryArtifactIndexFactory;
 
 import java.io.File;
 
@@ -25,7 +25,7 @@ import java.io.File;
  * Factory for Lucene artifact index instances.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @plexus.component role="org.apache.maven.repository.indexing.RepositoryArtifactIndexFactory" role-hint="lucene"
+ * @plexus.component role="org.apache.maven.archiva.indexing.RepositoryArtifactIndexFactory" role-hint="lucene"
  */
 public class LuceneRepositoryArtifactIndexFactory
     implements RepositoryArtifactIndexFactory
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneStandardIndexRecordConverter.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneStandardIndexRecordConverter.java
index f8f6a53b2..dafc01500 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneStandardIndexRecordConverter.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneStandardIndexRecordConverter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.lucene;
+package org.apache.maven.archiva.indexing.lucene;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -20,9 +20,9 @@ import org.apache.lucene.document.DateTools;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.NumberTools;
-import org.apache.maven.repository.indexing.record.RepositoryIndexRecord;
-import org.apache.maven.repository.indexing.record.StandardArtifactIndexRecord;
-import org.apache.maven.repository.indexing.record.StandardIndexRecordFields;
+import org.apache.maven.archiva.indexing.record.RepositoryIndexRecord;
+import org.apache.maven.archiva.indexing.record.StandardArtifactIndexRecord;
+import org.apache.maven.archiva.indexing.record.StandardIndexRecordFields;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.text.ParseException;
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQuery.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/CompoundQuery.java
index 85760b621..54f68de0c 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQuery.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/CompoundQuery.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.query;
+package org.apache.maven.archiva.indexing.query;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQueryTerm.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/CompoundQueryTerm.java
index abc99bd13..2538bb01a 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQueryTerm.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/CompoundQueryTerm.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.query;
+package org.apache.maven.archiva.indexing.query;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/Query.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/Query.java
index 2c6ac6137..c3d410b2a 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/Query.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/Query.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.query;
+package org.apache.maven.archiva.indexing.query;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/QueryTerm.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/QueryTerm.java
index 6db240b3a..bc949dcd2 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/QueryTerm.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/QueryTerm.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.query;
+package org.apache.maven.archiva.indexing.query;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/RangeQuery.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/RangeQuery.java
index 68e6d4a6a..c44303b27 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/RangeQuery.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/RangeQuery.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.query;

+package org.apache.maven.archiva.indexing.query;

 

 /*

  * Copyright 2005-2006 The Apache Software Foundation.

diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/SingleTermQuery.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/SingleTermQuery.java
index f7ae019fa..cb42007d5 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/SingleTermQuery.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/SingleTermQuery.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.query;
+package org.apache.maven.archiva.indexing.query;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/AbstractArtifactIndexRecordFactory.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/AbstractArtifactIndexRecordFactory.java
index 8a9a8cc91..0325e2ebc 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/AbstractArtifactIndexRecordFactory.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/AbstractArtifactIndexRecordFactory.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.record;
+package org.apache.maven.archiva.indexing.record;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,8 +16,8 @@ package org.apache.maven.repository.indexing.record;
  * 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.logging.AbstractLogEnabled;
 
 import java.io.File;
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecord.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/MinimalArtifactIndexRecord.java
index 4c212520c..747f7ab95 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecord.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/MinimalArtifactIndexRecord.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.record;
+package org.apache.maven.archiva.indexing.record;
 
 import java.util.Date;
 import java.util.List;
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactory.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/MinimalArtifactIndexRecordFactory.java
index 7f007747c..138094206 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactory.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/MinimalArtifactIndexRecordFactory.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.record;
+package org.apache.maven.archiva.indexing.record;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,8 +16,8 @@ package org.apache.maven.repository.indexing.record;
  * limitations under the License.
  */
 
+import org.apache.maven.archiva.digest.Digester;
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.repository.digest.Digester;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,17 +33,19 @@ import java.util.Set;
  *
  * @author Edwin Punzalan
  * @author Brett Porter
- * @plexus.component role="org.apache.maven.repository.indexing.record.RepositoryIndexRecordFactory" role-hint="minimal"
+ * @plexus.component role="org.apache.maven.archiva.indexing.record.RepositoryIndexRecordFactory" role-hint="minimal"
  */
 public class MinimalArtifactIndexRecordFactory
     extends AbstractArtifactIndexRecordFactory
 {
     /* List of types to index. */
     private static final Set INDEXED_TYPES = new HashSet( Arrays.asList( new String[]{"jar", "maven-plugin"} ) );
+
     /**
      * @plexus.requirement role-hint="sha1"
      */
     protected Digester sha1Digester;
+
     /**
      * @plexus.requirement role-hint="md5"
      */
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalIndexRecordFields.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/MinimalIndexRecordFields.java
index 5bb8add24..adb2d76a7 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalIndexRecordFields.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/MinimalIndexRecordFields.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.record;
+package org.apache.maven.archiva.indexing.record;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecord.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/RepositoryIndexRecord.java
index 10c99f1a3..64c69ee92 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecord.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/RepositoryIndexRecord.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.record;
+package org.apache.maven.archiva.indexing.record;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecordFactory.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/RepositoryIndexRecordFactory.java
index 2dde9674d..d3031439d 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecordFactory.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/RepositoryIndexRecordFactory.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.record;
+package org.apache.maven.archiva.indexing.record;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,8 +16,8 @@ package org.apache.maven.repository.indexing.record;
  * limitations under the License.
  */
 
+import org.apache.maven.archiva.indexing.RepositoryIndexException;
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.repository.indexing.RepositoryIndexException;
 
 /**
  * The layout of a record in a repository index.
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecord.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/StandardArtifactIndexRecord.java
index d2e97a4b2..9b543f3f8 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecord.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/StandardArtifactIndexRecord.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.record;
+package org.apache.maven.archiva.indexing.record;
 
 import java.util.List;
 
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactory.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/StandardArtifactIndexRecordFactory.java
index ec20288b2..27748050b 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactory.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/StandardArtifactIndexRecordFactory.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.record;
+package org.apache.maven.archiva.indexing.record;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,6 +16,8 @@ package org.apache.maven.repository.indexing.record;
  * limitations under the License.
  */
 
+import org.apache.maven.archiva.digest.Digester;
+import org.apache.maven.archiva.indexing.RepositoryIndexException;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -23,8 +25,6 @@ import org.apache.maven.model.Model;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.repository.digest.Digester;
-import org.apache.maven.repository.indexing.RepositoryIndexException;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -48,7 +48,7 @@ import java.util.zip.ZipFile;
  *
  * @author Edwin Punzalan
  * @author Brett Porter
- * @plexus.component role="org.apache.maven.repository.indexing.record.RepositoryIndexRecordFactory" role-hint="standard"
+ * @plexus.component role="org.apache.maven.archiva.indexing.record.RepositoryIndexRecordFactory" role-hint="standard"
  */
 public class StandardArtifactIndexRecordFactory
     extends AbstractArtifactIndexRecordFactory
@@ -94,13 +94,13 @@ public class StandardArtifactIndexRecordFactory
         StandardArtifactIndexRecord record = null;
 
         File file = artifact.getFile();
-        
+
         // TODO: is this condition really a possibility?
         if ( file != null && file.exists() )
         {
             String md5 = readChecksum( file, md5Digester );
             String sha1 = readChecksum( file, sha1Digester );
-            
+
             List files = null;
             boolean archive = ARCHIVE_TYPES.contains( artifact.getType() );
             try
diff --git a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardIndexRecordFields.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/StandardIndexRecordFields.java
index 5bfdf3347..5515a8b62 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardIndexRecordFields.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/StandardIndexRecordFields.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.record;
+package org.apache.maven.archiva.indexing.record;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-indexer/src/site/apt/design.apt b/archiva-indexer/src/site/apt/design.apt
index d083789e3..c442f57d8 100644
--- a/archiva-indexer/src/site/apt/design.apt
+++ b/archiva-indexer/src/site/apt/design.apt
@@ -88,7 +88,7 @@ Indexer Design
 * Reduced Size Index
 
   An additional index is maintained by the repository manager in the
-  {{{../apidocs/org/apache/maven/repository/indexing/MinimalArtifactIndexRecord.html} MinimalIndex}} class. This
+  {{{../apidocs/org/apache/maven/archiva/indexing/MinimalArtifactIndexRecord.html} MinimalIndex}} class. This
   indexes all of the same artifacts as the first index, but stores them with shorter field names and less information to
   maintain a smaller size. This index is appropriate for use by certain clients such as IDE integration for fast
   searching. For a fuller interface to the repository information, the integration should use the XMLRPC interface.
diff --git a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexSearchTest.java b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneMinimalArtifactIndexSearchTest.java
index 63198db55..caac994b7 100644
--- a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexSearchTest.java
+++ b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneMinimalArtifactIndexSearchTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.lucene;
+package org.apache.maven.archiva.indexing.lucene;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -19,17 +19,17 @@ package org.apache.maven.repository.indexing.lucene;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
+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.record.MinimalIndexRecordFields;
+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.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
 import org.apache.maven.artifact.versioning.VersionRange;
-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.record.MinimalIndexRecordFields;
-import org.apache.maven.repository.indexing.record.RepositoryIndexRecordFactory;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.FileUtils;
 
@@ -207,7 +207,7 @@ public class LuceneMinimalArtifactIndexSearchTest
 
     private Artifact createArtifact( String artifactId, String version, String type, String classifier )
     {
-        Artifact artifact = artifactFactory.createDependencyArtifact( "org.apache.maven.repository.record", artifactId,
+        Artifact artifact = artifactFactory.createDependencyArtifact( "org.apache.maven.archiva.record", artifactId,
                                                                       VersionRange.createFromVersion( version ), type,
                                                                       classifier, Artifact.SCOPE_RUNTIME );
         artifact.isSnapshot();
diff --git a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexTest.java b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneMinimalArtifactIndexTest.java
index a08d181ac..5fddc326c 100644
--- a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexTest.java
+++ b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneMinimalArtifactIndexTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.lucene;
+package org.apache.maven.archiva.indexing.lucene;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -21,17 +21,17 @@ import org.apache.lucene.document.Document;
 import org.apache.lucene.document.NumberTools;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
+import org.apache.maven.archiva.indexing.RepositoryArtifactIndex;
+import org.apache.maven.archiva.indexing.RepositoryArtifactIndexFactory;
+import org.apache.maven.archiva.indexing.RepositoryIndexException;
+import org.apache.maven.archiva.indexing.record.MinimalIndexRecordFields;
+import org.apache.maven.archiva.indexing.record.RepositoryIndexRecord;
+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.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.repository.indexing.RepositoryArtifactIndex;
-import org.apache.maven.repository.indexing.RepositoryArtifactIndexFactory;
-import org.apache.maven.repository.indexing.RepositoryIndexException;
-import org.apache.maven.repository.indexing.record.MinimalIndexRecordFields;
-import org.apache.maven.repository.indexing.record.RepositoryIndexRecord;
-import org.apache.maven.repository.indexing.record.RepositoryIndexRecordFactory;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -287,8 +287,8 @@ public class LuceneMinimalArtifactIndexTest
         try
         {
             Document document = reader.document( 0 );
-            assertRecord( document, artifact, "06f6fe25e46c4d4fb5be4f56a9bab0ee",
-                          "org.apache.maven.repository.record.MyMojo" );
+            assertRecord( document, artifact, "3530896791670ebb45e17708e5d52c40",
+                          "org.apache.maven.archiva.record.MyMojo" );
             assertEquals( "Check index size", 1, reader.numDocs() );
         }
         finally
@@ -305,7 +305,7 @@ public class LuceneMinimalArtifactIndexTest
     private Artifact createArtifact( String artifactId, String version, String type )
     {
         Artifact artifact =
-            artifactFactory.createBuildArtifact( "org.apache.maven.repository.record", artifactId, version, type );
+            artifactFactory.createBuildArtifact( "org.apache.maven.archiva.record", artifactId, version, type );
         artifact.setFile( new File( repository.getBasedir(), repository.pathOf( artifact ) ) );
         artifact.setRepository( repository );
         return artifact;
diff --git a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexSearchTest.java b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneStandardArtifactIndexSearchTest.java
index 19ff16439..bac0e3d32 100644
--- a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexSearchTest.java
+++ b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneStandardArtifactIndexSearchTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.lucene;
+package org.apache.maven.archiva.indexing.lucene;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -22,17 +22,17 @@ import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.MatchAllDocsQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
+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.record.RepositoryIndexRecordFactory;
+import org.apache.maven.archiva.indexing.record.StandardIndexRecordFields;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
 import org.apache.maven.artifact.versioning.VersionRange;
-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.record.RepositoryIndexRecordFactory;
-import org.apache.maven.repository.indexing.record.StandardIndexRecordFields;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.FileUtils;
 
@@ -173,7 +173,7 @@ public class LuceneStandardArtifactIndexSearchTest
         throws RepositoryIndexSearchException
     {
         Query query =
-            new TermQuery( new Term( StandardIndexRecordFields.GROUPID_EXACT, "org.apache.maven.repository.record" ) );
+            new TermQuery( new Term( StandardIndexRecordFields.GROUPID_EXACT, "org.apache.maven.archiva.record" ) );
         List results = index.search( new LuceneQuery( query ) );
 
         assertEquals( "Check results size", 10, results.size() );
@@ -408,8 +408,7 @@ public class LuceneStandardArtifactIndexSearchTest
     public void testMatchGroupId()
         throws RepositoryIndexSearchException
     {
-        Query query =
-            new TermQuery( new Term( StandardIndexRecordFields.GROUPID, "org.apache.maven.repository.record" ) );
+        Query query = new TermQuery( new Term( StandardIndexRecordFields.GROUPID, "org.apache.maven.archiva.record" ) );
         List results = index.search( new LuceneQuery( query ) );
 
         assertEquals( "Check results size", 10, results.size() );
@@ -689,7 +688,7 @@ public class LuceneStandardArtifactIndexSearchTest
 
     private Artifact createArtifact( String artifactId, String version, String type, String classifier )
     {
-        Artifact artifact = artifactFactory.createDependencyArtifact( "org.apache.maven.repository.record", artifactId,
+        Artifact artifact = artifactFactory.createDependencyArtifact( "org.apache.maven.archiva.record", artifactId,
                                                                       VersionRange.createFromVersion( version ), type,
                                                                       classifier, Artifact.SCOPE_RUNTIME );
         artifact.isSnapshot();
diff --git a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexTest.java b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneStandardArtifactIndexTest.java
index 4329dc452..8c25109a3 100644
--- a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexTest.java
+++ b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneStandardArtifactIndexTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.lucene;
+package org.apache.maven.archiva.indexing.lucene;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -21,17 +21,17 @@ import org.apache.lucene.document.Document;
 import org.apache.lucene.document.NumberTools;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
+import org.apache.maven.archiva.indexing.RepositoryArtifactIndex;
+import org.apache.maven.archiva.indexing.RepositoryArtifactIndexFactory;
+import org.apache.maven.archiva.indexing.RepositoryIndexException;
+import org.apache.maven.archiva.indexing.record.RepositoryIndexRecord;
+import org.apache.maven.archiva.indexing.record.RepositoryIndexRecordFactory;
+import org.apache.maven.archiva.indexing.record.StandardIndexRecordFields;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.repository.indexing.RepositoryArtifactIndex;
-import org.apache.maven.repository.indexing.RepositoryArtifactIndexFactory;
-import org.apache.maven.repository.indexing.RepositoryIndexException;
-import org.apache.maven.repository.indexing.record.RepositoryIndexRecord;
-import org.apache.maven.repository.indexing.record.RepositoryIndexRecordFactory;
-import org.apache.maven.repository.indexing.record.StandardIndexRecordFields;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -305,7 +305,7 @@ public class LuceneStandardArtifactIndexTest
     private Artifact createArtifact( String artifactId, String version, String type )
     {
         Artifact artifact =
-            artifactFactory.createBuildArtifact( "org.apache.maven.repository.record", artifactId, version, type );
+            artifactFactory.createBuildArtifact( "org.apache.maven.archiva.record", artifactId, version, type );
         artifact.setFile( new File( repository.getBasedir(), repository.pathOf( artifact ) ) );
         artifact.setRepository( repository );
         return artifact;
@@ -335,7 +335,7 @@ public class LuceneStandardArtifactIndexTest
     {
         assertEquals( "Check document filename", repository.pathOf( artifact ),
                       document.get( StandardIndexRecordFields.FILENAME ) );
-        assertEquals( "Check document groupId", "org.apache.maven.repository.record",
+        assertEquals( "Check document groupId", "org.apache.maven.archiva.record",
                       document.get( StandardIndexRecordFields.GROUPID ) );
         assertEquals( "Check document artifactId", expectedArtifactId,
                       document.get( StandardIndexRecordFields.ARTIFACTID ) );
@@ -353,8 +353,8 @@ public class LuceneStandardArtifactIndexTest
 
     private void assertPomRecord( Artifact artifact, Document document )
     {
-        assertRecord( artifact, document, "test-pom", "pom", "32dbef7ff11eb933bd8b7e7bcab85406",
-                      "c3b374e394607e1e705e71c227f62641e8621ebe" );
+        assertRecord( artifact, document, "test-pom", "pom", "103d11ac601a42ccf2a2ae54d308c362",
+                      "4c4d237c5366df877c3a636d5b6241822d090355" );
         assertNull( "Check document classes", document.get( StandardIndexRecordFields.CLASSES ) );
         assertNull( "Check document files", document.get( StandardIndexRecordFields.FILES ) );
         assertNull( "Check document pluginPrefix", document.get( StandardIndexRecordFields.PLUGIN_PREFIX ) );
@@ -382,15 +382,14 @@ public class LuceneStandardArtifactIndexTest
 
     private void assertPluginRecord( Artifact artifact, Document document )
     {
-        assertRecord( artifact, document, "test-plugin", "maven-plugin", "06f6fe25e46c4d4fb5be4f56a9bab0ee",
-                      "382c1ebfb5d0c7d6061c2f8569fb53f8fc00fec2" );
-        assertEquals( "Check document classes", "org.apache.maven.repository.record.MyMojo",
+        assertRecord( artifact, document, "test-plugin", "maven-plugin", "3530896791670ebb45e17708e5d52c40",
+                      "2cd2619d59a684e82e97471d2c2e004144c8f24e" );
+        assertEquals( "Check document classes", "org.apache.maven.archiva.record.MyMojo",
                       document.get( StandardIndexRecordFields.CLASSES ) );
-        assertEquals( "Check document files", "META-INF/MANIFEST.MF\n" + "META-INF/maven/plugin.xml\n" +
-            "org/apache/maven/repository/record/MyMojo.class\n" +
-            "META-INF/maven/org.apache.maven.repository.record/test-plugin/pom.xml\n" +
-            "META-INF/maven/org.apache.maven.repository.record/test-plugin/pom.properties",
-                                              document.get( StandardIndexRecordFields.FILES ) );
+        assertEquals( "Check document files", "META-INF/MANIFEST.MF\n" +
+            "META-INF/maven/org.apache.maven.archiva.record/test-plugin/pom.properties\n" +
+            "META-INF/maven/org.apache.maven.archiva.record/test-plugin/pom.xml\n" + "META-INF/maven/plugin.xml\n" +
+            "org/apache/maven/archiva/record/MyMojo.class", document.get( StandardIndexRecordFields.FILES ) );
         assertEquals( "Check document pluginPrefix", "test", document.get( StandardIndexRecordFields.PLUGIN_PREFIX ) );
         assertEquals( "Check document packaging", "maven-plugin", document.get( StandardIndexRecordFields.PACKAGING ) );
         assertNull( "Check document inceptionYear", document.get( StandardIndexRecordFields.INCEPTION_YEAR ) );
diff --git a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/query/QueryTest.java b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/query/QueryTest.java
index 17364046f..2e90f10e6 100644
--- a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/query/QueryTest.java
+++ b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/query/QueryTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.query;
+package org.apache.maven.archiva.indexing.query;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactoryTest.java b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/record/MinimalArtifactIndexRecordFactoryTest.java
index 32d97b329..9f35d9440 100644
--- a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactoryTest.java
+++ b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/record/MinimalArtifactIndexRecordFactoryTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.record;
+package org.apache.maven.archiva.indexing.record;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,13 +16,13 @@ package org.apache.maven.repository.indexing.record;
  * limitations under the License.
  */
 
+import org.apache.maven.archiva.indexing.RepositoryIndexException;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
 import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.repository.indexing.RepositoryIndexException;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
@@ -46,7 +46,7 @@ public class MinimalArtifactIndexRecordFactoryTest
 
     private ArtifactFactory artifactFactory;
 
-    private static final String TEST_GROUP_ID = "org.apache.maven.repository.record";
+    private static final String TEST_GROUP_ID = "org.apache.maven.archiva.record";
 
     private static final List JAR_CLASS_LIST = Arrays.asList( new String[]{"A", "b.B", "b.c.C"} );
 
@@ -178,11 +178,11 @@ public class MinimalArtifactIndexRecordFactoryTest
         RepositoryIndexRecord record = factory.createRecord( artifact );
 
         MinimalArtifactIndexRecord expectedRecord = new MinimalArtifactIndexRecord();
-        expectedRecord.setMd5Checksum( "06f6fe25e46c4d4fb5be4f56a9bab0ee" );
+        expectedRecord.setMd5Checksum( "3530896791670ebb45e17708e5d52c40" );
         expectedRecord.setFilename( repository.pathOf( artifact ) );
         expectedRecord.setLastModified( artifact.getFile().lastModified() );
         expectedRecord.setSize( artifact.getFile().length() );
-        expectedRecord.setClasses( Collections.singletonList( "org.apache.maven.repository.record.MyMojo" ) );
+        expectedRecord.setClasses( Collections.singletonList( "org.apache.maven.archiva.record.MyMojo" ) );
 
         assertEquals( "check record", expectedRecord, record );
     }
diff --git a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactoryTest.java b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/record/StandardArtifactIndexRecordFactoryTest.java
index 790c2bed4..842228cb3 100644
--- a/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactoryTest.java
+++ b/archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/record/StandardArtifactIndexRecordFactoryTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.indexing.record;
+package org.apache.maven.archiva.indexing.record;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,13 +16,13 @@ package org.apache.maven.repository.indexing.record;
  * limitations under the License.
  */
 
+import org.apache.maven.archiva.indexing.RepositoryIndexException;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
 import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.repository.indexing.RepositoryIndexException;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
@@ -45,7 +45,7 @@ public class StandardArtifactIndexRecordFactoryTest
 
     private ArtifactFactory artifactFactory;
 
-    private static final String TEST_GROUP_ID = "org.apache.maven.repository.record";
+    private static final String TEST_GROUP_ID = "org.apache.maven.archiva.record";
 
     private static final List JAR_CLASS_LIST = Arrays.asList( new String[]{"A", "b.B", "b.c.C"} );
 
@@ -214,7 +214,7 @@ public class StandardArtifactIndexRecordFactoryTest
         RepositoryIndexRecord record = factory.createRecord( artifact );
 
         StandardArtifactIndexRecord expectedRecord = new StandardArtifactIndexRecord();
-        expectedRecord.setMd5Checksum( "32dbef7ff11eb933bd8b7e7bcab85406" );
+        expectedRecord.setMd5Checksum( "103d11ac601a42ccf2a2ae54d308c362" );
         expectedRecord.setFilename( repository.pathOf( artifact ) );
         expectedRecord.setLastModified( artifact.getFile().lastModified() );
         expectedRecord.setSize( artifact.getFile().length() );
@@ -222,7 +222,7 @@ public class StandardArtifactIndexRecordFactoryTest
         expectedRecord.setGroupId( TEST_GROUP_ID );
         expectedRecord.setBaseVersion( "1.0" );
         expectedRecord.setVersion( "1.0" );
-        expectedRecord.setSha1Checksum( "c3b374e394607e1e705e71c227f62641e8621ebe" );
+        expectedRecord.setSha1Checksum( "4c4d237c5366df877c3a636d5b6241822d090355" );
         expectedRecord.setType( "pom" );
         expectedRecord.setRepository( "test" );
         expectedRecord.setPackaging( "pom" );
@@ -264,7 +264,7 @@ public class StandardArtifactIndexRecordFactoryTest
         RepositoryIndexRecord record = factory.createRecord( artifact );
 
         StandardArtifactIndexRecord expectedRecord = new StandardArtifactIndexRecord();
-        expectedRecord.setMd5Checksum( "06f6fe25e46c4d4fb5be4f56a9bab0ee" );
+        expectedRecord.setMd5Checksum( "3530896791670ebb45e17708e5d52c40" );
         expectedRecord.setFilename( repository.pathOf( artifact ) );
         expectedRecord.setLastModified( artifact.getFile().lastModified() );
         expectedRecord.setSize( artifact.getFile().length() );
@@ -272,14 +272,14 @@ public class StandardArtifactIndexRecordFactoryTest
         expectedRecord.setGroupId( TEST_GROUP_ID );
         expectedRecord.setBaseVersion( "1.0" );
         expectedRecord.setVersion( "1.0" );
-        expectedRecord.setSha1Checksum( "382c1ebfb5d0c7d6061c2f8569fb53f8fc00fec2" );
+        expectedRecord.setSha1Checksum( "2cd2619d59a684e82e97471d2c2e004144c8f24e" );
         expectedRecord.setType( "maven-plugin" );
         expectedRecord.setRepository( "test" );
-        expectedRecord.setClasses( Arrays.asList( new String[]{"org.apache.maven.repository.record.MyMojo"} ) );
-        expectedRecord.setFiles( Arrays.asList( new String[]{"META-INF/MANIFEST.MF", "META-INF/maven/plugin.xml",
-            "org/apache/maven/repository/record/MyMojo.class",
-            "META-INF/maven/org.apache.maven.repository.record/test-plugin/pom.xml",
-            "META-INF/maven/org.apache.maven.repository.record/test-plugin/pom.properties"} ) );
+        expectedRecord.setClasses( Arrays.asList( new String[]{"org.apache.maven.archiva.record.MyMojo"} ) );
+        expectedRecord.setFiles( Arrays.asList( new String[]{"META-INF/MANIFEST.MF",
+            "META-INF/maven/org.apache.maven.archiva.record/test-plugin/pom.properties",
+            "META-INF/maven/org.apache.maven.archiva.record/test-plugin/pom.xml", "META-INF/maven/plugin.xml",
+            "org/apache/maven/archiva/record/MyMojo.class"} ) );
         expectedRecord.setPackaging( "maven-plugin" );
         expectedRecord.setProjectName( "Maven Mojo Archetype" );
         expectedRecord.setPluginPrefix( "test" );
@@ -295,7 +295,7 @@ public class StandardArtifactIndexRecordFactoryTest
         RepositoryIndexRecord record = factory.createRecord( artifact );
 
         StandardArtifactIndexRecord expectedRecord = new StandardArtifactIndexRecord();
-        expectedRecord.setMd5Checksum( "ecefd4674c75a175119572b19edc45f1" );
+        expectedRecord.setMd5Checksum( "52b7ea4b53818b8a5f4c329d88fd60d9" );
         expectedRecord.setFilename( repository.pathOf( artifact ) );
         expectedRecord.setLastModified( artifact.getFile().lastModified() );
         expectedRecord.setSize( artifact.getFile().length() );
@@ -303,13 +303,13 @@ public class StandardArtifactIndexRecordFactoryTest
         expectedRecord.setGroupId( TEST_GROUP_ID );
         expectedRecord.setBaseVersion( "1.0" );
         expectedRecord.setVersion( "1.0" );
-        expectedRecord.setSha1Checksum( "5ebabafdbcd6684ae434c06e22c32844df284b05" );
+        expectedRecord.setSha1Checksum( "05841f5e51c124f1729d86c1687438c36b9255d9" );
         expectedRecord.setType( "maven-archetype" );
         expectedRecord.setRepository( "test" );
-        expectedRecord.setFiles( Arrays.asList( new String[]{"META-INF/MANIFEST.MF", "archetype-resources/pom.xml",
-            "archetype-resources/src/main/java/App.java", "archetype-resources/src/test/java/AppTest.java",
-            "META-INF/maven/archetype.xml", "META-INF/maven/org.apache.maven.repository.record/test-archetype/pom.xml",
-            "META-INF/maven/org.apache.maven.repository.record/test-archetype/pom.properties"} ) );
+        expectedRecord.setFiles( Arrays.asList( new String[]{"META-INF/MANIFEST.MF", "META-INF/maven/archetype.xml",
+            "META-INF/maven/org.apache.maven.archiva.record/test-archetype/pom.properties",
+            "META-INF/maven/org.apache.maven.archiva.record/test-archetype/pom.xml", "archetype-resources/pom.xml",
+            "archetype-resources/src/main/java/App.java", "archetype-resources/src/test/java/AppTest.java"} ) );
         expectedRecord.setPackaging( "jar" );
         expectedRecord.setProjectName( "Archetype - test-archetype" );
 
diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/parent-pom/1/parent-pom-1.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/parent-pom/1/parent-pom-1.pom
index 162f02ac6..c7348595f 100644
--- a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/parent-pom/1/parent-pom-1.pom
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/parent-pom/1/parent-pom-1.pom
@@ -14,9 +14,9 @@
   ~ limitations under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.repository.record</groupId>
+  <groupId>org.apache.maven.archiva.record</groupId>
   <artifactId>parent-pom</artifactId>
   <version>1</version>
   <packaging>pom</packaging>
diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-archetype/1.0/test-archetype-1.0.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-archetype/1.0/test-archetype-1.0.jar
new file mode 100644
index 000000000..6b5db4295
--- /dev/null
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-archetype/1.0/test-archetype-1.0.jar
diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-archetype/1.0/test-archetype-1.0.pom
index 7b9d7c7f7..60ec3ec68 100644
--- a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.pom
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-archetype/1.0/test-archetype-1.0.pom
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.repository.record</groupId>
+  <groupId>org.apache.maven.archiva.record</groupId>
   <artifactId>test-archetype</artifactId>
   <version>1.0</version>
   <name>Archetype - test-archetype</name>
diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar
index b78be2eb8..b78be2eb8 100644
--- a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar
diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom
index b247e7aa3..1bf63afc2 100644
--- a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom
@@ -15,10 +15,10 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven.repository.record</groupId>
+    <groupId>org.apache.maven.archiva.record</groupId>
     <artifactId>parent-pom</artifactId>
     <version>1</version>
   </parent>
diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar
index e69de29bb..e69de29bb 100644
--- a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar
diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll
index e69de29bb..e69de29bb 100644
--- a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll
diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar
index b78be2eb8..b78be2eb8 100644
--- a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar
diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar
index b78be2eb8..b78be2eb8 100644
--- a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar
diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom
index 6d2d2a78a..dce711522 100644
--- a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom
@@ -15,9 +15,9 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.repository.record</groupId>
+  <groupId>org.apache.maven.archiva.record</groupId>
   <artifactId>test-jar-and-pom</artifactId>
   <version>1.0-alpha-1</version>
   <name>Test JAR and POM</name>
diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0-jdk14.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar/1.0/test-jar-1.0-jdk14.jar
index b78be2eb8..b78be2eb8 100644
--- a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0-jdk14.jar
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar/1.0/test-jar-1.0-jdk14.jar
diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar/1.0/test-jar-1.0.jar
index b78be2eb8..b78be2eb8 100644
--- a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0.jar
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar/1.0/test-jar-1.0.jar
diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-plugin/1.0/test-plugin-1.0.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-plugin/1.0/test-plugin-1.0.jar
new file mode 100644
index 000000000..1c0b105fe
--- /dev/null
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-plugin/1.0/test-plugin-1.0.jar
diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-plugin/1.0/test-plugin-1.0.pom
index 7baa980d2..a7bdb5c0b 100644
--- a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.pom
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-plugin/1.0/test-plugin-1.0.pom
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.repository.record</groupId>
+  <groupId>org.apache.maven.archiva.record</groupId>
   <artifactId>test-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <version>1.0</version>
diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-pom/1.0/test-pom-1.0.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-pom/1.0/test-pom-1.0.pom
index 34b9e1f3f..ea517e7ad 100644
--- a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-pom/1.0/test-pom-1.0.pom
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-pom/1.0/test-pom-1.0.pom
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.repository.record</groupId>
+  <groupId>org.apache.maven.archiva.record</groupId>
   <artifactId>test-pom</artifactId>
   <version>1.0</version>
   <name>Maven Repository Manager Test POM</name>
diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.jar
deleted file mode 100644
index e1686a206..000000000
--- a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.jar
+++ /dev/null
diff --git a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.jar
deleted file mode 100644
index a7f3a67a8..000000000
--- a/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.jar
+++ /dev/null