cleanup unused variables

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

3 files changed, 1 insertions, 42 deletions

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
index 2a5f3466b..1e9f117a3 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
@@ -60,7 +60,6 @@ import org.apache.maven.archiva.repository.metadata.RepositoryMetadataException;
 import org.apache.maven.archiva.repository.metadata.RepositoryMetadataMerge;
 import org.apache.maven.archiva.repository.metadata.RepositoryMetadataReader;
 import org.apache.maven.archiva.repository.metadata.RepositoryMetadataWriter;
-import org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers;
 import org.apache.maven.archiva.scheduled.ArchivaTaskScheduler;
 import org.apache.maven.archiva.security.ServletAuthenticator;
 import org.apache.maven.archiva.webdav.util.MimeTypes;
@@ -82,8 +81,6 @@ import org.codehaus.plexus.redback.policy.MustChangePasswordException;
 import org.codehaus.plexus.redback.system.SecuritySession;
 import org.codehaus.plexus.redback.users.User;
 import org.codehaus.plexus.redback.users.UserManager;
-import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
-import org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator;
 import org.slf4j.Logger;
@@ -154,11 +151,6 @@ public class ArchivaDavResourceFactory
     /**
      * @plexus.requirement
      */
-    private RepositoryContentConsumers consumers;
-
-    /**
-     * @plexus.requirement
-     */
     private ChecksumFile checksum;
 
     /**
@@ -170,22 +162,12 @@ public class ArchivaDavResourceFactory
      * @plexus.requirement role-hint="md5";
      */
     private Digester digestMd5;
-    
-    /**
-     * @plexus.requirement role-hint="repository-scanning"
-     */
-    private TaskExecutor taskExecutor;
-    
+        
     /**
      * @plexus.requirement
      */
     private ArchivaTaskScheduler scheduler;
     
-    /**
-     * @plexus.requirement role-hint="repository-scanning"
-     */
-    private TaskQueueExecutor repoScanningTaskQueueExecutor;
-
     public DavResource createResource( final DavResourceLocator locator, final DavServletRequest request,
                                        final DavServletResponse response )
         throws DavException
@@ -1034,11 +1016,6 @@ public class ArchivaDavResourceFactory
         this.httpAuth = httpAuth;
     }
 
-    public void setTaskExecutor( TaskExecutor taskExecutor )
-    {
-        this.taskExecutor = taskExecutor;
-    }
-
     public void setScheduler( ArchivaTaskScheduler scheduler )
     {
         this.scheduler = scheduler;
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml
index 418e38b34..bd9196bdf 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml
@@ -131,10 +131,6 @@
           <field-name>httpAuth</field-name>
         </requirement>
         <requirement>
-          <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
-          <role-hint>default</role-hint>
-        </requirement>
-        <requirement>
           <role>org.codehaus.plexus.digest.ChecksumFile</role>
           <field-name>checksum</field-name>
         </requirement>
@@ -149,11 +145,6 @@
           <field-name>digestMd5</field-name>
         </requirement>
         <requirement>
-          <role>org.codehaus.plexus.taskqueue.execution.TaskExecutor</role>
-          <role-hint>repository-scanning</role-hint>
-          <field-name>taskExecutor</field-name>
-        </requirement>
-        <requirement>
           <role>org.apache.maven.archiva.scheduled.ArchivaTaskScheduler</role>
           <field-name>scheduler</field-name>
         </requirement>
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml
index a04b4cfdc..74a63e922 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml
@@ -143,10 +143,6 @@
           <field-name>httpAuth</field-name>
         </requirement>
         <requirement>
-          <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
-          <role-hint>default</role-hint>
-        </requirement>
-        <requirement>
           <role>org.codehaus.plexus.digest.ChecksumFile</role>
           <field-name>checksum</field-name>
         </requirement>
@@ -161,11 +157,6 @@
           <field-name>digestMd5</field-name>
         </requirement>
         <requirement>
-          <role>org.codehaus.plexus.taskqueue.execution.TaskExecutor</role>
-          <role-hint>repository-scanning</role-hint>
-          <field-name>taskExecutor</field-name>
-        </requirement>
-        <requirement>
           <role>org.apache.maven.archiva.scheduled.ArchivaTaskScheduler</role>
           <field-name>scheduler</field-name>
         </requirement>