cleanup unused variables

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

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 2a5f3466b24954e4ed5b8f6d703ca53af2ac3d4c..1e9f117a3fcf3c52027b79bcf8ac290fea1eb59c 100644 (file)
--- 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;
@@ -151,11 +148,6 @@ public class ArchivaDavResourceFactory
      */
     private final LockManager lockManager = new SimpleLockManager();
 
-    /**
-     * @plexus.requirement
-     */
-    private RepositoryContentConsumers consumers;
-
     /**
      * @plexus.requirement
      */
@@ -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 418e38b34466571a5ba147701a85e3ec370bfa29..bd9196bdfd2f7261b34445a71c6f66fd43aa0490 100644 (file)
--- 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
@@ -130,10 +130,6 @@
           <role-hint>basic</role-hint>
           <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>
@@ -148,11 +144,6 @@
           <role-hint>md5</role-hint>
           <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>

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 a04b4cfdc0c6869554b5580e0945f3ddb8c2d0ca..74a63e922ad7fac3cfc597ba9339c258ec15c561 100644 (file)
--- 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
@@ -142,10 +142,6 @@
           <role-hint>basic</role-hint>
           <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>
@@ -160,11 +156,6 @@
           <role-hint>md5</role-hint>
           <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>