rename package indexing -> indexer

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

archiva-core/src/main/java/org/apache/maven/archiva/scheduler/IndexerTask.java

@@ -23,10 +23,10 @@ import org.apache.maven.archiva.configuration.ConfiguredRepositoryFactory;
 import org.apache.maven.archiva.configuration.RepositoryConfiguration;
 import org.apache.maven.archiva.discovery.ArtifactDiscoverer;
 import org.apache.maven.archiva.discovery.DiscovererException;
-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.RepositoryIndexRecordFactory;
+import org.apache.maven.archiva.indexer.RepositoryArtifactIndex;
+import org.apache.maven.archiva.indexer.RepositoryArtifactIndexFactory;
+import org.apache.maven.archiva.indexer.RepositoryIndexException;
+import org.apache.maven.archiva.indexer.record.RepositoryIndexRecordFactory;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.codehaus.plexus.logging.AbstractLogEnabled;

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryArtifactIndex.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryArtifactIndex.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.indexing;
+package org.apache.maven.archiva.indexer;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,7 +16,7 @@ package org.apache.maven.archiva.indexing;
  * limitations under the License.
  */
 
-import org.apache.maven.archiva.indexing.query.Query;
+import org.apache.maven.archiva.indexer.query.Query;
 
 import java.util.Collection;
 import java.util.List;

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryArtifactIndexFactory.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryArtifactIndexFactory.java

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

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryIndexException.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryIndexException.java

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

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/RepositoryIndexSearchException.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryIndexSearchException.java

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

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneIndexRecordConverter.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneIndexRecordConverter.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.indexing.lucene;
+package org.apache.maven.archiva.indexer.lucene;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -17,7 +17,7 @@ package org.apache.maven.archiva.indexing.lucene;
  */
 
 import org.apache.lucene.document.Document;
-import org.apache.maven.archiva.indexing.record.RepositoryIndexRecord;
+import org.apache.maven.archiva.indexer.record.RepositoryIndexRecord;
 
 import java.text.ParseException;
 

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneMinimalIndexRecordConverter.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalIndexRecordConverter.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.indexing.lucene;
+package org.apache.maven.archiva.indexer.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.archiva.indexing.record.MinimalArtifactIndexRecord;
-import org.apache.maven.archiva.indexing.record.MinimalIndexRecordFields;
-import org.apache.maven.archiva.indexing.record.RepositoryIndexRecord;
+import org.apache.maven.archiva.indexer.record.MinimalArtifactIndexRecord;
+import org.apache.maven.archiva.indexer.record.MinimalIndexRecordFields;
+import org.apache.maven.archiva.indexer.record.RepositoryIndexRecord;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.text.ParseException;

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneQuery.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneQuery.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.indexing.lucene;
+package org.apache.maven.archiva.indexer.lucene;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,7 +16,7 @@ package org.apache.maven.archiva.indexing.lucene;
  * limitations under the License.
  */
 
-import org.apache.maven.archiva.indexing.query.Query;
+import org.apache.maven.archiva.indexer.query.Query;
 
 /**
  * A holder for a lucene query to pass to the indexer API.

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneRepositoryArtifactIndex.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryArtifactIndex.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.indexing.lucene;
+package org.apache.maven.archiva.indexer.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.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 org.apache.maven.archiva.indexer.RepositoryArtifactIndex;
+import org.apache.maven.archiva.indexer.RepositoryIndexException;
+import org.apache.maven.archiva.indexer.RepositoryIndexSearchException;
+import org.apache.maven.archiva.indexer.query.Query;
+import org.apache.maven.archiva.indexer.record.RepositoryIndexRecord;
 
 import java.io.File;
 import java.io.IOException;

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneRepositoryArtifactIndexFactory.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryArtifactIndexFactory.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.indexing.lucene;
+package org.apache.maven.archiva.indexer.lucene;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,8 +16,8 @@ package org.apache.maven.archiva.indexing.lucene;
  * limitations under the License.
  */
 
-import org.apache.maven.archiva.indexing.RepositoryArtifactIndex;
-import org.apache.maven.archiva.indexing.RepositoryArtifactIndexFactory;
+import org.apache.maven.archiva.indexer.RepositoryArtifactIndex;
+import org.apache.maven.archiva.indexer.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.archiva.indexing.RepositoryArtifactIndexFactory" role-hint="lucene"
+ * @plexus.component role="org.apache.maven.archiva.indexer.RepositoryArtifactIndexFactory" role-hint="lucene"
  */
 public class LuceneRepositoryArtifactIndexFactory
     implements RepositoryArtifactIndexFactory

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/lucene/LuceneStandardIndexRecordConverter.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardIndexRecordConverter.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.indexing.lucene;
+package org.apache.maven.archiva.indexer.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.archiva.indexing.record.RepositoryIndexRecord;
-import org.apache.maven.archiva.indexing.record.StandardArtifactIndexRecord;
-import org.apache.maven.archiva.indexing.record.StandardIndexRecordFields;
+import org.apache.maven.archiva.indexer.record.RepositoryIndexRecord;
+import org.apache.maven.archiva.indexer.record.StandardArtifactIndexRecord;
+import org.apache.maven.archiva.indexer.record.StandardIndexRecordFields;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.text.ParseException;

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/CompoundQuery.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/CompoundQuery.java

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

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/CompoundQueryTerm.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/CompoundQueryTerm.java

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

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/Query.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/Query.java

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

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/QueryTerm.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/QueryTerm.java

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

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/RangeQuery.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/RangeQuery.java

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

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/query/SingleTermQuery.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/SingleTermQuery.java

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

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/AbstractArtifactIndexRecordFactory.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/AbstractArtifactIndexRecordFactory.java

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

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/MinimalArtifactIndexRecord.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecord.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.indexing.record;
+package org.apache.maven.archiva.indexer.record;
 
 import java.util.Date;
 import java.util.List;

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/MinimalArtifactIndexRecordFactory.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactory.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.indexing.record;
+package org.apache.maven.archiva.indexer.record;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -33,7 +33,7 @@ import java.util.Set;
  *
  * @author Edwin Punzalan
  * @author Brett Porter
- * @plexus.component role="org.apache.maven.archiva.indexing.record.RepositoryIndexRecordFactory" role-hint="minimal"
+ * @plexus.component role="org.apache.maven.archiva.indexer.record.RepositoryIndexRecordFactory" role-hint="minimal"
  */
 public class MinimalArtifactIndexRecordFactory
     extends AbstractArtifactIndexRecordFactory

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/MinimalIndexRecordFields.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalIndexRecordFields.java

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

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/RepositoryIndexRecord.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/RepositoryIndexRecord.java

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

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/RepositoryIndexRecordFactory.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/RepositoryIndexRecordFactory.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.indexing.record;
+package org.apache.maven.archiva.indexer.record;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,7 +16,7 @@ package org.apache.maven.archiva.indexing.record;
  * limitations under the License.
  */
 
-import org.apache.maven.archiva.indexing.RepositoryIndexException;
+import org.apache.maven.archiva.indexer.RepositoryIndexException;
 import org.apache.maven.artifact.Artifact;
 
 /**

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/StandardArtifactIndexRecord.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecord.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.indexing.record;
+package org.apache.maven.archiva.indexer.record;
 
 import java.util.List;
 

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/StandardArtifactIndexRecordFactory.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactory.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.indexing.record;
+package org.apache.maven.archiva.indexer.record;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -17,7 +17,7 @@ package org.apache.maven.archiva.indexing.record;
  */
 
 import org.apache.maven.archiva.digest.Digester;
-import org.apache.maven.archiva.indexing.RepositoryIndexException;
+import org.apache.maven.archiva.indexer.RepositoryIndexException;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -48,7 +48,7 @@ import java.util.zip.ZipFile;
  *
  * @author Edwin Punzalan
  * @author Brett Porter
- * @plexus.component role="org.apache.maven.archiva.indexing.record.RepositoryIndexRecordFactory" role-hint="standard"
+ * @plexus.component role="org.apache.maven.archiva.indexer.record.RepositoryIndexRecordFactory" role-hint="standard"
  */
 public class StandardArtifactIndexRecordFactory
     extends AbstractArtifactIndexRecordFactory

archiva-indexer/src/main/java/org/apache/maven/archiva/indexing/record/StandardIndexRecordFields.java → archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardIndexRecordFields.java

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

archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneMinimalArtifactIndexSearchTest.java → archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalArtifactIndexSearchTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.indexing.lucene;
+package org.apache.maven.archiva.indexer.lucene;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -19,11 +19,11 @@ package org.apache.maven.archiva.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.archiva.indexer.RepositoryArtifactIndex;
+import org.apache.maven.archiva.indexer.RepositoryArtifactIndexFactory;
+import org.apache.maven.archiva.indexer.RepositoryIndexSearchException;
+import org.apache.maven.archiva.indexer.record.MinimalIndexRecordFields;
+import org.apache.maven.archiva.indexer.record.RepositoryIndexRecordFactory;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;

archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneMinimalArtifactIndexTest.java → archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalArtifactIndexTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.indexing.lucene;
+package org.apache.maven.archiva.indexer.lucene;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -21,12 +21,12 @@ 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.archiva.indexer.RepositoryArtifactIndex;
+import org.apache.maven.archiva.indexer.RepositoryArtifactIndexFactory;
+import org.apache.maven.archiva.indexer.RepositoryIndexException;
+import org.apache.maven.archiva.indexer.record.MinimalIndexRecordFields;
+import org.apache.maven.archiva.indexer.record.RepositoryIndexRecord;
+import org.apache.maven.archiva.indexer.record.RepositoryIndexRecordFactory;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;

archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneStandardArtifactIndexSearchTest.java → archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardArtifactIndexSearchTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.indexing.lucene;
+package org.apache.maven.archiva.indexer.lucene;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -22,11 +22,11 @@ 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.archiva.indexer.RepositoryArtifactIndex;
+import org.apache.maven.archiva.indexer.RepositoryArtifactIndexFactory;
+import org.apache.maven.archiva.indexer.RepositoryIndexSearchException;
+import org.apache.maven.archiva.indexer.record.RepositoryIndexRecordFactory;
+import org.apache.maven.archiva.indexer.record.StandardIndexRecordFields;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;

archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/lucene/LuceneStandardArtifactIndexTest.java → archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardArtifactIndexTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.indexing.lucene;
+package org.apache.maven.archiva.indexer.lucene;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -21,12 +21,12 @@ 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.archiva.indexer.RepositoryArtifactIndex;
+import org.apache.maven.archiva.indexer.RepositoryArtifactIndexFactory;
+import org.apache.maven.archiva.indexer.RepositoryIndexException;
+import org.apache.maven.archiva.indexer.record.RepositoryIndexRecord;
+import org.apache.maven.archiva.indexer.record.RepositoryIndexRecordFactory;
+import org.apache.maven.archiva.indexer.record.StandardIndexRecordFields;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -353,8 +353,8 @@ public class LuceneStandardArtifactIndexTest
 
     private void assertPomRecord( Artifact artifact, Document document )
     {
-        assertRecord( artifact, document, "test-pom", "pom", "103d11ac601a42ccf2a2ae54d308c362",
-                      "4c4d237c5366df877c3a636d5b6241822d090355" );
+        assertRecord( artifact, document, "test-pom", "pom", "98b4a1b708a90a8637aaf541bef5094f",
+                      "d95348bee1666a46511260696292bfa0519b61c1" );
         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 ) );

archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/query/QueryTest.java → archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/query/QueryTest.java

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

archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/record/MinimalArtifactIndexRecordFactoryTest.java → archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactoryTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.indexing.record;
+package org.apache.maven.archiva.indexer.record;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,7 +16,7 @@ package org.apache.maven.archiva.indexing.record;
  * limitations under the License.
  */
 
-import org.apache.maven.archiva.indexing.RepositoryIndexException;
+import org.apache.maven.archiva.indexer.RepositoryIndexException;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;

archiva-indexer/src/test/java/org/apache/maven/archiva/indexing/record/StandardArtifactIndexRecordFactoryTest.java → archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactoryTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.indexing.record;
+package org.apache.maven.archiva.indexer.record;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,7 +16,7 @@ package org.apache.maven.archiva.indexing.record;
  * limitations under the License.
  */
 
-import org.apache.maven.archiva.indexing.RepositoryIndexException;
+import org.apache.maven.archiva.indexer.RepositoryIndexException;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -214,7 +214,7 @@ public class StandardArtifactIndexRecordFactoryTest
         RepositoryIndexRecord record = factory.createRecord( artifact );
 
         StandardArtifactIndexRecord expectedRecord = new StandardArtifactIndexRecord();
-        expectedRecord.setMd5Checksum( "103d11ac601a42ccf2a2ae54d308c362" );
+        expectedRecord.setMd5Checksum( "98b4a1b708a90a8637aaf541bef5094f" );
         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( "4c4d237c5366df877c3a636d5b6241822d090355" );
+        expectedRecord.setSha1Checksum( "d95348bee1666a46511260696292bfa0519b61c1" );
         expectedRecord.setType( "pom" );
         expectedRecord.setRepository( "test" );
         expectedRecord.setPackaging( "pom" );

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

@@ -20,12 +20,12 @@ 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.archiva.indexer.RepositoryArtifactIndex;
+import org.apache.maven.archiva.indexer.RepositoryArtifactIndexFactory;
+import org.apache.maven.archiva.indexer.RepositoryIndexSearchException;
+import org.apache.maven.archiva.indexer.lucene.LuceneQuery;
+import org.apache.maven.archiva.indexer.record.StandardArtifactIndexRecord;
+import org.apache.maven.archiva.indexer.record.StandardIndexRecordFields;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.model.Model;

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

@@ -16,9 +16,9 @@ package org.apache.maven.archiva.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.archiva.indexer.RepositoryArtifactIndex;
+import org.apache.maven.archiva.indexer.RepositoryArtifactIndexFactory;
+import org.apache.maven.archiva.indexer.record.RepositoryIndexRecordFactory;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.model.Model;

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

@@ -10,7 +10,7 @@
           <role-hint>md5</role-hint>
         </requirement>
         <requirement>
-          <role>org.apache.maven.archiva.indexing.RepositoryArtifactIndexFactory</role>
+          <role>org.apache.maven.archiva.indexer.RepositoryArtifactIndexFactory</role>
         </requirement>
       </requirements>
       <configuration>

archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java

@@ -26,13 +26,13 @@ import org.apache.maven.archiva.configuration.Configuration;
 import org.apache.maven.archiva.configuration.ConfigurationStore;
 import org.apache.maven.archiva.configuration.ConfigurationStoreException;
 import org.apache.maven.archiva.configuration.ConfiguredRepositoryFactory;
-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.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.archiva.indexer.RepositoryArtifactIndex;
+import org.apache.maven.archiva.indexer.RepositoryArtifactIndexFactory;
+import org.apache.maven.archiva.indexer.RepositoryIndexException;
+import org.apache.maven.archiva.indexer.RepositoryIndexSearchException;
+import org.apache.maven.archiva.indexer.lucene.LuceneQuery;
+import org.apache.maven.archiva.indexer.record.StandardArtifactIndexRecord;
+import org.apache.maven.archiva.indexer.record.StandardIndexRecordFields;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.io.File;

archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java

@@ -26,12 +26,12 @@ import org.apache.maven.archiva.configuration.Configuration;
 import org.apache.maven.archiva.configuration.ConfigurationStore;
 import org.apache.maven.archiva.configuration.ConfigurationStoreException;
 import org.apache.maven.archiva.configuration.ConfiguredRepositoryFactory;
-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.RepositoryIndexSearchException;
-import org.apache.maven.archiva.indexing.lucene.LuceneQuery;
-import org.apache.maven.archiva.indexing.record.StandardIndexRecordFields;
+import org.apache.maven.archiva.indexer.RepositoryArtifactIndex;
+import org.apache.maven.archiva.indexer.RepositoryArtifactIndexFactory;
+import org.apache.maven.archiva.indexer.RepositoryIndexException;
+import org.apache.maven.archiva.indexer.RepositoryIndexSearchException;
+import org.apache.maven.archiva.indexer.lucene.LuceneQuery;
+import org.apache.maven.archiva.indexer.record.StandardIndexRecordFields;
 
 import java.io.File;
 import java.net.MalformedURLException;

archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAction.java

@@ -24,8 +24,8 @@ import org.apache.maven.archiva.configuration.ConfigurationChangeException;
 import org.apache.maven.archiva.configuration.ConfigurationStore;
 import org.apache.maven.archiva.configuration.ConfigurationStoreException;
 import org.apache.maven.archiva.configuration.InvalidConfigurationException;
-import org.apache.maven.archiva.indexing.RepositoryIndexException;
-import org.apache.maven.archiva.indexing.RepositoryIndexSearchException;
+import org.apache.maven.archiva.indexer.RepositoryIndexException;
+import org.apache.maven.archiva.indexer.RepositoryIndexSearchException;
 
 import java.io.File;
 import java.io.IOException;