[MRM-1025] further references to the old name cleaned up

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

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/BytecodeStatsToDatabaseConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/BytecodeStatsToDatabaseConsumer.java
index 301814ea0f27d6acaf2f6aaee71d03b79d6204e9..554ff6a987cd74e0a81c866e286f7bedfa6a206b 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/BytecodeStatsToDatabaseConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/BytecodeStatsToDatabaseConsumer.java
@@ -31,7 +31,7 @@ import java.util.List;
  *
  * @version $Id$
  * 
- * @plexus.component role="org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer"
+ * @plexus.component role="org.apache.maven.archiva.database.updater.DatabaseUnprocessedArtifactConsumer"
  *                   role-hint="update-db-bytecode-stats"
  *                   instantiation-strategy="per-lookup"
  */

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumer.java
index 49ca811c22ae08d291af2595a56cfcfb1294f2f5..c849cc88e92fb7fda0783d03bfa07e6f27621824 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumer.java
@@ -42,7 +42,7 @@ import java.io.File;
  *         <a href="mailto:oching@apache.org">Maria Odea Ching</a>
  * @version $Id$
  * 
- * @plexus.component role="org.apache.maven.archiva.consumers.DatabaseCleanupConsumer"
+ * @plexus.component role="org.apache.maven.archiva.database.updater.DatabaseCleanupConsumer"
  *                   role-hint="not-present-remove-db-artifact"
  *                   instantiation-strategy="per-lookup"
  */

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumer.java
index fa3aad2c6320234e14cf6ae58aee7f0dc0355630..52c799593af5561fbd7ea2aaac994c4c8ee19b89 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumer.java
@@ -42,7 +42,7 @@ import java.io.File;
  *         <a href="mailto:oching@apache.org">Maria Odea Ching</a>
  * @version $Id$
  * 
- * @plexus.component role="org.apache.maven.archiva.consumers.DatabaseCleanupConsumer"
+ * @plexus.component role="org.apache.maven.archiva.database.updater.DatabaseCleanupConsumer"
  *                   role-hint="not-present-remove-db-project"
  *                   instantiation-strategy="per-lookup"
  */

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
index 58edd1c775efaf13f9ffcfe4771b7fe932f17f42..28f5c0a9d128a1ab10f794e4a9922a9d4f273834 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
  * ProjectModelToDatabaseConsumer
  *
  * @version $Id$
- * @plexus.component role="org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer"
+ * @plexus.component role="org.apache.maven.archiva.database.updater.DatabaseUnprocessedArtifactConsumer"
  * role-hint="update-db-project"
  * instantiation-strategy="per-lookup"
  */

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/VerifyMetadataAgainstDatabaseConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/VerifyMetadataAgainstDatabaseConsumer.java
index b1bf0844483250101ed2154c6c13870047649ef7..d9dd2b8b90f0f0dd433ac2afba5e7cb6150fc50f 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/VerifyMetadataAgainstDatabaseConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/VerifyMetadataAgainstDatabaseConsumer.java
@@ -31,7 +31,7 @@ import java.util.List;
  *
  * @version $Id$
  * 
- * @plexus.component role="org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer"
+ * @plexus.component role="org.apache.maven.archiva.database.updater.DatabaseUnprocessedArtifactConsumer"
  *                   role-hint="validate-repository-metadata"
  *                   instantiation-strategy="per-lookup"
  */

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java
index 36db421c2e9b466ed5673d4664d6d5c01666db26..45517a6631b6a362803f66ee548303c825a1f500 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
  * IndexArtifactConsumer
  *
  * @version $Id$
- * @plexus.component role="org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer"
+ * @plexus.component role="org.apache.maven.archiva.database.updater.DatabaseUnprocessedArtifactConsumer"
  * role-hint="index-artifact"
  * instantiation-strategy="per-lookup"
  */

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexJavaPublicMethodsConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexJavaPublicMethodsConsumer.java
index 3b7d31a188db592fd26eb5492f2f056831153526..67d228f733847a2000d3d0d1ee5d02bdd9ad63eb 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexJavaPublicMethodsConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexJavaPublicMethodsConsumer.java
@@ -51,7 +51,7 @@ import java.util.zip.ZipFile;
  *         <a href="mailto:oching@apache.org">Maria Odea Ching</a>
  * @version $Id$
  * 
- * @plexus.component role="org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer"
+ * @plexus.component role="org.apache.maven.archiva.database.updater.DatabaseUnprocessedArtifactConsumer"
  *                   role-hint="index-public-methods"
  *                   instantiation-strategy="per-lookup"
  */

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumer.java
index 5b7a00f90143c90f074e2cf47667467c9739cef5..048426e7afc5f46680e3ac28aaf863028e17d95b 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumer.java
@@ -40,7 +40,7 @@ import java.util.List;
  * LuceneCleanupRemoveIndexedConsumer
  * 
  * @version $Id$
- * @plexus.component role="org.apache.maven.archiva.consumers.DatabaseCleanupConsumer"
+ * @plexus.component role="org.apache.maven.archiva.database.updater.DatabaseCleanupConsumer"
  *                   role-hint="not-present-remove-indexed" instantiation-strategy="per-lookup"
  */
 public class LuceneCleanupRemoveIndexedConsumer

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/org/apache/maven/archiva/consumers/lucene/IndexJavaPublicMethodsConsumerTest.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/org/apache/maven/archiva/consumers/lucene/IndexJavaPublicMethodsConsumerTest.xml
index 93f760b56dbd8f00c8b85e4f7b72779c316e5c94..f596d11cc3ca45bd88557eba76b660227de67d0c 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/org/apache/maven/archiva/consumers/lucene/IndexJavaPublicMethodsConsumerTest.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/org/apache/maven/archiva/consumers/lucene/IndexJavaPublicMethodsConsumerTest.xml
@@ -2,7 +2,7 @@
   <components>
 <!-- for testing repo purge using retention count -->
     <component>
-      <role>org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer</role>
+      <role>org.apache.maven.archiva.database.updater.DatabaseUnprocessedArtifactConsumer</role>
       <role-hint>index-public-methods</role-hint>
       <implementation>org.apache.maven.archiva.consumers.lucene.IndexJavaPublicMethodsConsumer</implementation>
       <requirements>
@@ -61,4 +61,4 @@
       </configuration>
     </component>
   </components>
-</component-set>
\ No newline at end of file
+</component-set>

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumerTest.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumerTest.xml
index 0c096a7c08316ca8eaa9f3c3e73bc06c5a0b748f..ef7cbef6d7497775ddfbc36b6ae901c28c984ba4 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumerTest.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumerTest.xml
@@ -22,7 +22,7 @@
   <components>
     
     <component>
-      <role>org.apache.maven.archiva.consumers.DatabaseCleanupConsumer</role>
+      <role>org.apache.maven.archiva.database.updater.DatabaseCleanupConsumer</role>
       <role-hint>lucene-cleanup</role-hint>
       <implementation>org.apache.maven.archiva.consumers.lucene.LuceneCleanupRemoveIndexedConsumer</implementation>
       <requirements>

diff --git a/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/updater/DatabaseConsumers.java b/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/updater/DatabaseConsumers.java
index af5c647de3a82a11e5189f432bb4eddd3a25ef2e..a57c6ef55fee835978fc641fb0b1f17cd3baaf73 100644 (file)
--- a/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/updater/DatabaseConsumers.java
+++ b/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/updater/DatabaseConsumers.java
@@ -48,12 +48,12 @@ public class DatabaseConsumers
     private ArchivaConfiguration archivaConfiguration;
 
     /**
-     * @plexus.requirement role="org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer"
+     * @plexus.requirement role="org.apache.maven.archiva.database.updater.DatabaseUnprocessedArtifactConsumer"
      */
     private List availableUnprocessedConsumers;
 
     /**
-     * @plexus.requirement role="org.apache.maven.archiva.consumers.DatabaseCleanupConsumer"
+     * @plexus.requirement role="org.apache.maven.archiva.database.updater.DatabaseCleanupConsumer"
      */
     private List availableCleanupConsumers;
 

diff --git a/archiva-modules/archiva-scheduled/src/test/resources/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutorTest.xml b/archiva-modules/archiva-scheduled/src/test/resources/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutorTest.xml
index 24e60e8fb291454c68f9137c9e6f550206c3b7ba..d563701e7edc6627e83c8935ce52aede930e6faf 100644 (file)
--- a/archiva-modules/archiva-scheduled/src/test/resources/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutorTest.xml
+++ b/archiva-modules/archiva-scheduled/src/test/resources/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutorTest.xml
@@ -67,13 +67,13 @@
     </component>
 
     <component>
-      <role>org.apache.maven.archiva.consumers.DatabaseCleanupConsumer</role>
+      <role>org.apache.maven.archiva.database.updater.DatabaseCleanupConsumer</role>
       <role-hint>test-db-cleanup</role-hint>
       <implementation>org.apache.maven.archiva.scheduled.TestDatabaseCleanupConsumer</implementation>
     </component>
 
     <component>
-      <role>org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer</role>
+      <role>org.apache.maven.archiva.database.updater.DatabaseUnprocessedArtifactConsumer</role>
       <role-hint>test-db-unprocessed</role-hint>
       <implementation>org.apache.maven.archiva.scheduled.TestDatabaseUnprocessedConsumer</implementation>
     </component>