get RID of plexus.requirement annotation

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

18 files changed, 45 insertions, 64 deletions

diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
index 158220483..268667b49 100644
--- a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
+++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
@@ -75,7 +75,7 @@ public class LegacyToDefaultConverter
 {
     /**
      * {@link List}<{@link Digester}
-     * plexus.requirement role="org.codehaus.plexus.digest.Digester"
+     *
      */
     private List<? extends Digester> digesters;
 
@@ -86,17 +86,17 @@ public class LegacyToDefaultConverter
     private DigesterUtils digesterUtils;
 
     /**
-     * plexus.requirement
+     *
      */
     private ModelConverter translator;
 
     /**
-     * plexus.requirement
+     *
      */
     private ArtifactFactory artifactFactory;
 
     /**
-     * plexus.requirement
+     *
      */
     private ArtifactHandlerManager artifactHandlerManager;
 
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
index 6cfe80c66..34f72d808 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
@@ -94,8 +94,7 @@ public class DefaultArchivaConfiguration
 
     /**
      * Plexus registry to read the configuration from.
-     * <p/>
-     * plexus.requirement role-hint="commons-configuration"
+     *
      */
     @Inject
     @Named( value = "commons-configuration" )
@@ -111,7 +110,6 @@ public class DefaultArchivaConfiguration
 
     /**
      * see #initialize
-     * plexus.requirement role="org.apache.maven.archiva.policies.PreDownloadPolicy"
      *
      * @todo these don't strictly belong in here
      */
@@ -119,7 +117,6 @@ public class DefaultArchivaConfiguration
 
     /**
      * see #initialize
-     * plexus.requirement role="org.apache.maven.archiva.policies.PostDownloadPolicy"
      *
      * @todo these don't strictly belong in here
      */
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java
index c15239a5d..80d04af87 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java
@@ -60,7 +60,7 @@ public class FileTypes
     public static final String IGNORED = "ignored";
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named( value = "archivaConfiguration#default" )
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
index 8c3dab815..751998a34 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
@@ -62,13 +62,13 @@ public class AutoRemoveConsumer
     private String description = "Automatically Remove File from Filesystem.";
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private ArchivaConfiguration configuration;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private FileTypes filetypes;
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
index a3a6a7a13..2189a0bfa 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
@@ -77,25 +77,25 @@ public class MetadataUpdaterConsumer
     private String description = "Update / Create maven-metadata.xml files";
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private RepositoryContentFactory repositoryFactory;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private MetadataTools metadataTools;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private ArchivaConfiguration configuration;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private FileTypes filetypes;
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
index cea01ef7c..b0adf3aa5 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
@@ -72,12 +72,12 @@ public class ValidateChecksumConsumer
     private String description = "Validate checksums against file.";
 
     /**
-     * plexus.requirement
+     *
      */
     private ChecksumFile checksum;
 
     /**
-     * plexus.requirement role="org.codehaus.plexus.digest.Digester"
+     *
      */
     private List<Digester> allDigesters;
 
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 e8bb7697f..a690d1566 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
@@ -69,27 +69,27 @@ public class RepositoryPurgeConsumer
     private String description = "Purge repository of old snapshots";
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named( value = "archivaConfiguration#default" )
     private ArchivaConfiguration configuration;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named(value = "repositoryContentFactory#default")
     private RepositoryContentFactory repositoryContentFactory;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private MetadataTools metadataTools;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named(value = "fileTypes")
@@ -103,19 +103,15 @@ public class RepositoryPurgeConsumer
 
     private boolean deleteReleasedSnapshots;
 
-    //@Inject
-    //private ApplicationContext applicationContext;
-
     /**
-     * plexus.requirement role="org.apache.archiva.repository.events.RepositoryListener"
+     *
      */
     @Inject
     private List<RepositoryListener> listeners = Collections.emptyList();
 
     /**
      * TODO: this could be multiple implementations and needs to be configured.
-     * <p/>
-     * plexus.requirement
+     *
      */
     @Inject
     private RepositorySessionFactory repositorySessionFactory;
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
index 6ab572662..f526cb2a9 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
@@ -73,13 +73,11 @@ public class ArchivaMetadataCreationConsumer
     private String description = "Create basic metadata for Archiva to be able to reference the artifact";
 
     /**
-     * plexus.requirement
      */
     @Inject
     private ArchivaConfiguration configuration;
 
     /**
-     * plexus.requirement
      */
     @Inject
     private FileTypes filetypes;
@@ -91,7 +89,6 @@ public class ArchivaMetadataCreationConsumer
     /**
      * FIXME: can be of other types
      *
-     * @plexus.requirement
      */
     @Inject
     private RepositorySessionFactory repositorySessionFactory;
@@ -100,7 +97,6 @@ public class ArchivaMetadataCreationConsumer
      * FIXME: this needs to be configurable based on storage type - and could also be instantiated per repo. Change to a
      * factory.
      *
-     * plexus.requirement role-hint="maven2"
      */
     @Inject
     @Named(value = "repositoryStorage#maven2")
diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
index 6ca889735..02950448b 100644
--- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
+++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
@@ -51,25 +51,24 @@ public class DefaultLegacyRepositoryConverter
     implements LegacyRepositoryConverter
 {
     /**
-     * plexus.requirement
+     *
      */
     private ArtifactRepositoryFactory artifactRepositoryFactory;
 
     /**
-     * plexus.requirement role-hint="default"
+     *
      */
     private ArtifactRepositoryLayout defaultLayout;
 
     /**
-     * plexus.requirement role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
-     * role-hint="artifact-legacy-to-default-converter"
+     *
      */
     @Inject
     @Named( value = "knownRepositoryContentConsumer#artifact-legacy-to-default-converter" )
     private LegacyConverterArtifactConsumer legacyConverterConsumer;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private RepositoryScanner repoScanner;
diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
index a86473ba2..92a7d0cc6 100644
--- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
+++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
@@ -59,13 +59,13 @@ public class LegacyConverterArtifactConsumer
     private Logger log = LoggerFactory.getLogger( LegacyConverterArtifactConsumer.class );
 
     /**
-     * plexus.requirement role-hint="legacy-to-default"
+     *
      */
     @Inject
     private ArtifactConverter artifactConverter;
 
     /**
-     * plexus.requirement
+     *
      */
     private ArtifactFactory artifactFactory;
 
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java
index 109c78202..45385b353 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java
@@ -56,7 +56,7 @@ public class CachedFailuresPolicy
     public static final String YES = "yes";
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private UrlFailureCache urlFailureCache;
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 ad667a46d..4d400b8d6 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
@@ -95,49 +95,46 @@ public class DefaultRepositoryProxyConnectors
     private Logger log = LoggerFactory.getLogger( DefaultRepositoryProxyConnectors.class );
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named( value = "archivaConfiguration#default" )
     private ArchivaConfiguration archivaConfiguration;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named( value = "repositoryContentFactory#default" )
     private RepositoryContentFactory repositoryFactory;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named( value = "metadataTools#default" )
     private MetadataTools metadataTools;
 
-    //@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;
 
     /**
-     * plexus.requirement role-hint="default"
+     *
      */
     @Inject
     private UrlFailureCache urlFailureCache;
@@ -147,13 +144,13 @@ public class DefaultRepositoryProxyConnectors
     private Map<String, ProxyInfo> networkProxyMap = new HashMap<String, ProxyInfo>();
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private WagonFactory wagonFactory;
 
     /**
-     * plexus.requirement role="org.apache.archiva.scheduler.ArchivaTaskScheduler" role-hint="repository"
+     *
      */
     @Inject
     @Named( value = "archivaTaskScheduler#repository" )
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryContentFactory.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryContentFactory.java
index 22e301c8a..af79060b6 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryContentFactory.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryContentFactory.java
@@ -43,7 +43,7 @@ public class RepositoryContentFactory
     implements RegistryListener
 {
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private ArchivaConfiguration archivaConfiguration;
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 062dd7d13..a691b13e4 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
@@ -60,19 +60,15 @@ public abstract class AbstractDefaultRepositoryContent
     private PathParser defaultPathParser = new DefaultPathParser();
 
     /**
-     * plexus.requirement role="org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider"
+     *
      */
     @Inject
     protected List<? extends ArtifactMappingProvider> artifactMappingProviders;
 
-    //@Inject
-    //protected ApplicationContext applicationContext;
-
     @PostConstruct
     protected void initialize()
     {
-        //artifactMappingProviders = new ArrayList<ArtifactMappingProvider>(
-        //    applicationContext.getBeansOfType( ArtifactMappingProvider.class ).values() );
+        // no op
     }
 
     public ArtifactReference toArtifactReference( String path )
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java
index e32d8d2d6..e29cd4814 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java
@@ -51,7 +51,7 @@ public abstract class AbstractLegacyRepositoryContent
     }
 
     /**
-     * plexus.requirement role-hint="legacy"
+     *
      */
     @Inject
     @Named( value = "pathParser#legacy" )
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java
index d1f00a71b..45b5d77aa 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java
@@ -53,7 +53,7 @@ public class ManagedLegacyRepositoryContent
     implements ManagedRepositoryContent
 {
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private FileTypes filetypes;
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java
index 1b397c674..ace302fcb 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java
@@ -88,14 +88,14 @@ public class MetadataTools
     private static final char GROUP_SEPARATOR = '.';
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named( value = "archivaConfiguration#default" )
     private ArchivaConfiguration configuration;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named(value = "fileTypes")
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
index 1f67853ff..6185efe91 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
@@ -45,13 +45,13 @@ public class DefaultRepositoryScanner
     implements RepositoryScanner
 {
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private FileTypes filetypes;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private RepositoryContentConsumers consumerUtil;