simplify inject of bean list

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

4 files changed, 20 insertions, 15 deletions

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/KnownRepositoryContentConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/KnownRepositoryContentConsumer.java
index b73209ec5..66d98459f 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/KnownRepositoryContentConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/KnownRepositoryContentConsumer.java
@@ -27,5 +27,5 @@ package org.apache.maven.archiva.consumers;
 public interface KnownRepositoryContentConsumer
     extends RepositoryContentConsumer
 {
-
+    // no op
 }
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
index 0f1a99975..b52fc4eeb 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
@@ -107,12 +107,13 @@ public class RepositoryPurgeConsumer
 
     private boolean deleteReleasedSnapshots;
 
-    @Inject
-    private ApplicationContext applicationContext;
+    //@Inject
+    //private ApplicationContext applicationContext;
 
     /**
      * plexus.requirement role="org.apache.archiva.repository.events.RepositoryListener"
      */
+    @Inject
     private List<RepositoryListener> listeners = Collections.emptyList();
 
     /**
@@ -250,8 +251,8 @@ public class RepositoryPurgeConsumer
     @PostConstruct
     public void initialize()
     {
-        this.listeners =
-            new ArrayList<RepositoryListener>( applicationContext.getBeansOfType( RepositoryListener.class ).values() );
+        //this.listeners =
+        //    new ArrayList<RepositoryListener>( applicationContext.getBeansOfType( RepositoryListener.class ).values() );
         configuration.addChangeListener( this );
 
         initIncludes();
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
index ec5042819..84782aef1 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
@@ -116,22 +116,25 @@ public class DefaultRepositoryProxyConnectors
     @Named( value = "metadataTools#default" )
     private MetadataTools metadataTools;
 
-    @Inject
-    private ApplicationContext applicationContext;
+    //@Inject
+    //private ApplicationContext applicationContext;
 
     /**
      * plexus.requirement role="org.apache.maven.archiva.policies.PreDownloadPolicy"
      */
+    @Inject
     private Map<String, PreDownloadPolicy> preDownloadPolicies;
 
     /**
      * plexus.requirement role="org.apache.maven.archiva.policies.PostDownloadPolicy"
      */
+    @Inject
     private Map<String, PostDownloadPolicy> postDownloadPolicies;
 
     /**
      * plexus.requirement role="org.apache.maven.archiva.policies.DownloadErrorPolicy"
      */
+    @Inject
     private Map<String, DownloadErrorPolicy> downloadErrorPolicies;
 
     /**
@@ -162,9 +165,9 @@ public class DefaultRepositoryProxyConnectors
     {
         initConnectorsAndNetworkProxies();
         archivaConfiguration.addChangeListener( this );
-        this.postDownloadPolicies = applicationContext.getBeansOfType( PostDownloadPolicy.class );
-        this.preDownloadPolicies = applicationContext.getBeansOfType( PreDownloadPolicy.class );
-        this.downloadErrorPolicies = applicationContext.getBeansOfType( DownloadErrorPolicy.class );
+        //this.postDownloadPolicies = applicationContext.getBeansOfType( PostDownloadPolicy.class );
+        //his.preDownloadPolicies = applicationContext.getBeansOfType( PreDownloadPolicy.class );
+        //this.downloadErrorPolicies = applicationContext.getBeansOfType( DownloadErrorPolicy.class );
     }
 
     @SuppressWarnings( "unchecked" )
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java
index 8c685a72c..a8556c9cc 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java
@@ -62,16 +62,17 @@ public abstract class AbstractDefaultRepositoryContent
     /**
      * plexus.requirement role="org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider"
      */
-    protected List<? extends ArtifactMappingProvider> artifactMappingProviders;
-
     @Inject
-    protected ApplicationContext applicationContext;
+    protected List<ArtifactMappingProvider> artifactMappingProviders;
+
+    //@Inject
+    //protected ApplicationContext applicationContext;
 
     @PostConstruct
     protected void initialize()
     {
-        artifactMappingProviders = new ArrayList<ArtifactMappingProvider>(
-            applicationContext.getBeansOfType( ArtifactMappingProvider.class ).values() );
+        //artifactMappingProviders = new ArrayList<ArtifactMappingProvider>(
+        //    applicationContext.getBeansOfType( ArtifactMappingProvider.class ).values() );
     }
 
     public ArtifactReference toArtifactReference( String path )