From 71b644e878f239a44ccdf8fd16ba693e6a620fa2 Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Tue, 21 Jul 2009 05:21:17 +0000 Subject: [PATCH] cleanup unused variables git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@796149 13f79535-47bb-0310-9956-ffa450edef68 --- .../webdav/ArchivaDavResourceFactory.java | 25 +------------------ .../webdav/RepositoryServletSecurityTest.xml | 9 ------- .../archiva/webdav/RepositoryServletTest.xml | 9 ------- 3 files changed, 1 insertion(+), 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; @@ -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 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 @@ -130,10 +130,6 @@ basic httpAuth - - org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers - default - org.codehaus.plexus.digest.ChecksumFile checksum @@ -148,11 +144,6 @@ md5 digestMd5 - - org.codehaus.plexus.taskqueue.execution.TaskExecutor - repository-scanning - taskExecutor - org.apache.maven.archiva.scheduled.ArchivaTaskScheduler scheduler 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 @@ -142,10 +142,6 @@ basic httpAuth - - org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers - default - org.codehaus.plexus.digest.ChecksumFile checksum @@ -160,11 +156,6 @@ md5 digestMd5 - - org.codehaus.plexus.taskqueue.execution.TaskExecutor - repository-scanning - taskExecutor - org.apache.maven.archiva.scheduled.ArchivaTaskScheduler scheduler -- 2.39.5