Rename BaseConsumer to Consumer

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

6 files changed, 11 insertions, 11 deletions

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java
index 7c306e1e0..b6ae1db52 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java
@@ -33,7 +33,7 @@ import org.apache.maven.archiva.configuration.FileTypes;
  * @version $Id$
  */
 public abstract class AbstractMonitoredConsumer
-    implements BaseConsumer
+    implements Consumer
 {
     private Set<ConsumerMonitor> monitors = new HashSet<ConsumerMonitor>();
     
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ArchivaArtifactConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ArchivaArtifactConsumer.java
index 209051742..61393e30f 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ArchivaArtifactConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ArchivaArtifactConsumer.java
@@ -29,7 +29,7 @@ import java.util.List;
  * @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
  * @version $Id$
  */
-public interface ArchivaArtifactConsumer extends BaseConsumer
+public interface ArchivaArtifactConsumer extends Consumer
 {
     /**
      * Get the list of included file patterns for this consumer.
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java
index 2f32f1fec..cffbb11eb 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java
@@ -20,12 +20,12 @@ package org.apache.maven.archiva.consumers;
  */
 
 /**
- * BaseConsumer - the base set of methods for a consumer. 
+ * Consumer - the base set of methods for a consumer.
  *
  * @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
  * @version $Id$
  */
-public abstract interface BaseConsumer
+public abstract interface Consumer
 {
     /**
      * This is the id for the consumer.
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ConsumerMonitor.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ConsumerMonitor.java
index 971414764..4feb01a1d 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ConsumerMonitor.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ConsumerMonitor.java
@@ -34,7 +34,7 @@ public interface ConsumerMonitor
      * @param type the type of error.
      * @param message the message about the error.
      */
-    public void consumerError( BaseConsumer consumer, String type, String message );
+    public void consumerError( Consumer consumer, String type, String message );
     
     /**
      * A consumer warning event.
@@ -43,7 +43,7 @@ public interface ConsumerMonitor
      * @param type the type of warning.
      * @param message the message about the warning.
      */
-    public void consumerWarning( BaseConsumer consumer, String type, String message );
+    public void consumerWarning( Consumer consumer, String type, String message );
 
     /**
      * A consumer informational event.
@@ -51,5 +51,5 @@ public interface ConsumerMonitor
      * @param consumer the consumer that caused the informational message.
      * @param message the message.
      */
-    public void consumerInfo( BaseConsumer consumer, String message );
+    public void consumerInfo( Consumer consumer, String message );
 }
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java
index 9b23e1713..2dca8be7b 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java
@@ -30,7 +30,7 @@ import java.util.List;
  * @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
  * @version $Id$
  */
-public interface RepositoryContentConsumer extends BaseConsumer
+public interface RepositoryContentConsumer extends Consumer
 {
     /**
      * Get the list of included file patterns for this consumer.
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/functors/PermanentConsumerPredicate.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/functors/PermanentConsumerPredicate.java
index 92b9e3a55..512becc56 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/functors/PermanentConsumerPredicate.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/functors/PermanentConsumerPredicate.java
@@ -20,7 +20,7 @@ package org.apache.maven.archiva.consumers.functors;
  */
 
 import org.apache.commons.collections.Predicate;
-import org.apache.maven.archiva.consumers.BaseConsumer;
+import org.apache.maven.archiva.consumers.Consumer;
 
 /**
  * Selects Consumers that are flaged as 'permanent'. 
@@ -36,9 +36,9 @@ public class PermanentConsumerPredicate
     {
         boolean satisfies = false;
 
-        if ( object instanceof BaseConsumer )
+        if ( object instanceof Consumer )
         {
-            BaseConsumer consumer = (BaseConsumer) object;
+            Consumer consumer = (Consumer) object;
             satisfies = consumer.isPermanent();
         }