diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/AbstractMonitoredConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/AbstractMonitoredConsumer.java
index e2580fe13..5b9155460 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/AbstractMonitoredConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/AbstractMonitoredConsumer.java
@@ -22,7 +22,6 @@
 import org.apache.archiva.common.FileTypeUtils;
 
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -34,13 +33,15 @@
 public abstract class AbstractMonitoredConsumer
     implements Consumer
 {
-    private Set<ConsumerMonitor> monitors = new HashSet<ConsumerMonitor>();
+    private final Set<ConsumerMonitor> monitors = new HashSet<ConsumerMonitor>();
     
+    @Override
     public void addConsumerMonitor( ConsumerMonitor monitor )
     {
         monitors.add( monitor );
     }
 
+    @Override
     public void removeConsumerMonitor( ConsumerMonitor monitor )
     {
         monitors.remove( monitor );
@@ -48,9 +49,8 @@ public void removeConsumerMonitor( ConsumerMonitor monitor )
 
     protected void triggerConsumerError( String type, String message )
     {
-        for ( Iterator<ConsumerMonitor> itmonitors = monitors.iterator(); itmonitors.hasNext(); )
+        for ( ConsumerMonitor monitor : monitors ) 
         {
-            ConsumerMonitor monitor = itmonitors.next();
             try
             {
                 monitor.consumerError( this, type, message );
@@ -64,9 +64,8 @@ protected void triggerConsumerError( String type, String message )
 
     protected void triggerConsumerWarning( String type, String message )
     {
-        for ( Iterator<ConsumerMonitor> itmonitors = monitors.iterator(); itmonitors.hasNext(); )
+        for ( ConsumerMonitor monitor : monitors ) 
         {
-            ConsumerMonitor monitor = itmonitors.next();
             try
             {
                 monitor.consumerWarning( this, type, message );
@@ -80,9 +79,8 @@ protected void triggerConsumerWarning( String type, String message )
 
     protected void triggerConsumerInfo( String message )
     {
-        for ( Iterator<ConsumerMonitor> itmonitors = monitors.iterator(); itmonitors.hasNext(); )
+        for ( ConsumerMonitor monitor : monitors ) 
         {
-            ConsumerMonitor monitor = itmonitors.next();
             try
             {
                 monitor.consumerInfo( this, message );
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/RepositoryContentConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/RepositoryContentConsumer.java
index d0483081e..c923f24be 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/RepositoryContentConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/RepositoryContentConsumer.java
@@ -95,9 +95,9 @@ void processFile( String path )
         throws ConsumerException;
 
     /**
-     * @param path
-     * @param executeOnEntireRepo
-     * @throws Exception
+     * @param path the relative file path (in the repository) to process.
+     * @param executeOnEntireRepo flags whether the consumer will be executed on an entire repository or just on a specific resource
+     * @throws Exception if there was a problem processing this file.
      */
     void processFile( String path, boolean executeOnEntireRepo )
         throws Exception;
@@ -114,7 +114,7 @@ void processFile( String path, boolean executeOnEntireRepo )
     void completeScan();
 
     /**
-     * @param executeOnEntireRepo
+     * @param executeOnEntireRepo flags whether the consumer will be executed on an entire repository or just on a specific resource
      */
     void completeScan( boolean executeOnEntireRepo );
 
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/ConsumerWantsFilePredicate.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/ConsumerWantsFilePredicate.java
index e52962c79..07dc5276e 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/ConsumerWantsFilePredicate.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/ConsumerWantsFilePredicate.java
@@ -62,6 +62,7 @@ public ConsumerWantsFilePredicate( ManagedRepository managedRepository )
         this.managedRepository = managedRepository;
     }
 
+    @Override
     public boolean evaluate( Object object )
     {
         boolean satisfies = false;
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/PermanentConsumerPredicate.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/PermanentConsumerPredicate.java
index cfb0bbf87..af76c4556 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/PermanentConsumerPredicate.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/PermanentConsumerPredicate.java
@@ -31,6 +31,7 @@ public class PermanentConsumerPredicate
     implements Predicate
 {
 
+    @Override
     public boolean evaluate( Object object )
     {
         boolean satisfies = false;
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/package-info.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/package-info.java
new file mode 100644
index 000000000..d3adb60ec
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Functors for Apache Archiva consumers
+ */
+package org.apache.archiva.consumers.functors;
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/package-info.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/package-info.java
new file mode 100644
index 000000000..2f051f04c
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Provides basic consumers API for Apache Archiva.
+ */
+package org.apache.archiva.consumers;