get RID of plexus.component annotation

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

28 files changed, 0 insertions, 80 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 712f8a6f2..158220483 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
@@ -68,8 +68,6 @@ import java.util.regex.Matcher;
  * LegacyToDefaultConverter
  *
  * @version $Id$
- * @plexus.component role="org.apache.maven.archiva.converter.artifact.ArtifactConverter"
- * role-hint="legacy-to-default"
  */
 @Service( "artifactConverter#legacy-to-default" )
 public class LegacyToDefaultConverter
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 e0a5b875a..6cfe80c66 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
@@ -85,8 +85,6 @@ import java.util.Set;
  * If the configuration is outdated, it will be upgraded when it is loaded. This is done by checking the version flag
  * before reading it from the registry.
  * </p>
- * <p/>
- * plexus.component role="org.apache.maven.archiva.configuration.ArchivaConfiguration"
  */
 @Service( "archivaConfiguration#default" )
 public class DefaultArchivaConfiguration
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 cf1c57720..c15239a5d 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
@@ -46,8 +46,6 @@ import java.util.Map;
  * FileTypes
  *
  * @version $Id$
- *          <p/>
- *          plexus.component role="org.apache.maven.archiva.configuration.FileTypes"
  */
 @Service( "fileTypes" )
 public class FileTypes
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 325581c9c..8c3dab815 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
@@ -44,9 +44,6 @@ import java.util.List;
  * AutoRemoveConsumer
  *
  * @version $Id$
- * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
- * role-hint="auto-remove"
- * instantiation-strategy="per-lookup"
  */
 @Service("knownRepositoryContentConsumer#auto-remove")
 @Scope("prototype")
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java
index 9ec80bce6..09dd5ca33 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java
@@ -40,9 +40,6 @@ import java.util.Map;
  * AutoRenameConsumer
  *
  * @version $Id$
- * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
- * role-hint="auto-rename"
- * instantiation-strategy="per-lookup"
  */
 @Service("knownRepositoryContentConsumer#auto-rename")
 @Scope("prototype")
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 2244f72e3..a3a6a7a13 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
@@ -57,9 +57,6 @@ import javax.inject.Inject;
  * MetadataUpdaterConsumer will create and update the metadata present within the repository.
  *
  * @version $Id$
- * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
- * role-hint="metadata-updater"
- * instantiation-strategy="per-lookup"
  */
 @Service("knownRepositoryContentConsumer#metadata-updater")
 @Scope("prototype")
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 13bb7575d..cea01ef7c 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
@@ -46,9 +46,6 @@ import java.util.List;
  * ValidateChecksumConsumer - validate the provided checksum against the file it represents.
  *
  * @version $Id$
- *          plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
- *          role-hint="validate-checksum"
- *          instantiation-strategy="per-lookup"
  */
 @Service( "knownRepositoryContentConsumer#validate-checksum" )
 @Scope( "prototype" )
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 b52fc4eeb..e8bb7697f 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
@@ -51,10 +51,6 @@ import java.util.List;
 /**
  * Consumer for removing old snapshots in the repository based on the criteria
  * specified by the user.
- * <p/>
- * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
- * role-hint="repository-purge"
- * instantiation-strategy="per-lookup"
  */
 @Service( "knownRepositoryContentConsumer#repository-purge" )
 @Scope( "prototype" )
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 6a774f591..6ab572662 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
@@ -55,8 +55,6 @@ import java.util.List;
  * Take an artifact off of disk and put it into the metadata repository.
  *
  * @version $Id: ArtifactUpdateDatabaseConsumer.java 718864 2008-11-19 06:33:35Z brett $
- * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
- * role-hint="create-archiva-metadata" instantiation-strategy="per-lookup"
  */
 @Service("knownRepositoryContentConsumer#create-archiva-metadata")
 @Scope("prototype")
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 46e9821d5..6ca889735 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
@@ -45,7 +45,6 @@ import java.util.List;
  * DefaultLegacyRepositoryConverter
  *
  * @version $Id$
- *          plexus.component
  */
 @Service( "legacyRepositoryConverter#default" )
 public class DefaultLegacyRepositoryConverter
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 f2bcd9812..a86473ba2 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
@@ -49,10 +49,6 @@ import java.util.List;
  * into the destination repository.
  *
  * @version $Id$
- *          <p/>
- *          plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
- *          role-hint="artifact-legacy-to-default-converter"
- *          instantiation-strategy="per-lookup"
  */
 @Service( "knownRepositoryContentConsumer#artifact-legacy-to-default-converter" )
 @Scope( "prototype" )
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 3eb2797fb..109c78202 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
@@ -36,8 +36,6 @@ import javax.inject.Inject;
  * {@link PreDownloadPolicy} to check if the requested url has failed before.
  *
  * @version $Id$
- * plexus.component role="org.apache.maven.archiva.policies.PreDownloadPolicy"
- * role-hint="cache-failures"
  */
 @Service("preDownloadPolicy#cache-failures")
 public class CachedFailuresPolicy
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ChecksumPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ChecksumPolicy.java
index dcbeb5429..4c87387aa 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ChecksumPolicy.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ChecksumPolicy.java
@@ -36,9 +36,6 @@ import org.springframework.stereotype.Service;
  * successfully and completely (or not).
  *
  * @version $Id$
- * 
- * plexus.component role="org.apache.maven.archiva.policies.PostDownloadPolicy"
- *                   role-hint="checksum"
  */
 @Service("postDownloadPolicy#checksum")
 public class ChecksumPolicy
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsDownloadPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsDownloadPolicy.java
index be090edc2..2fd35ee2d 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsDownloadPolicy.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsDownloadPolicy.java
@@ -32,9 +32,6 @@ import org.springframework.stereotype.Service;
 
 /**
  * PropagateErrorsPolicy - a policy applied on error to determine how to treat the error.
- *
- * plexus.component role="org.apache.maven.archiva.policies.DownloadErrorPolicy"
- * role-hint="propagate-errors"
  */
 @Service("downloadErrorPolicy#propagate-errors")
 public class PropagateErrorsDownloadPolicy
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java
index 0ea898376..230eb73f4 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java
@@ -30,9 +30,6 @@ import org.springframework.stereotype.Service;
 
 /**
  * PropagateErrorsPolicy - a policy applied on error to determine how to treat the error.
- *
- * plexus.component role="org.apache.maven.archiva.policies.DownloadErrorPolicy"
- *                   role-hint="propagate-errors-on-update"
  */
 @Service("downloadErrorPolicy#propagate-errors-on-update")
 public class PropagateErrorsOnUpdateDownloadPolicy
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ReleasesPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ReleasesPolicy.java
index 357407516..f990ecef6 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ReleasesPolicy.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ReleasesPolicy.java
@@ -26,9 +26,6 @@ import org.springframework.stereotype.Service;
  * {@link PreDownloadPolicy} to apply for released versions.
  *
  * @version $Id$
- * 
- * plexus.component role="org.apache.maven.archiva.policies.PreDownloadPolicy"
- *                   role-hint="releases"
  */
 @Service("preDownloadPolicy#releases")
 public class ReleasesPolicy
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/SnapshotsPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/SnapshotsPolicy.java
index 16b9a8eac..daeb3a50e 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/SnapshotsPolicy.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/SnapshotsPolicy.java
@@ -26,9 +26,6 @@ import org.springframework.stereotype.Service;
  * {@link PreDownloadPolicy} to apply for snapshot versions. 
  *
  * @version $Id$
- * 
- * plexus.component role="org.apache.maven.archiva.policies.PreDownloadPolicy"
- *                   role-hint="snapshots"
  */
 @Service("preDownloadPolicy#snapshots")
 public class SnapshotsPolicy
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 84782aef1..ad667a46d 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
@@ -87,7 +87,6 @@ import java.util.Properties;
  * @version $Id$
  * @todo exception handling needs work - "not modified" is not really an exceptional case, and it has more layers than
  * your average brown onion
- * plexus.component role-hint="default"
  */
 @Service( "repositoryProxyConnectors#default" )
 public class DefaultRepositoryProxyConnectors
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java
index 9caaaf70e..56549d9e2 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java
@@ -41,9 +41,6 @@ import javax.annotation.PostConstruct;
  * MockConfiguration
  *
  * @version $Id$
- *          <p/>
- *          plexus.component role="org.apache.maven.archiva.configuration.ArchivaConfiguration"
- *          role-hint="mock"
  */
 @Service( "archivaConfiguration#mock" )
 public class MockConfiguration
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 497b66651..22e301c8a 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
@@ -37,9 +37,6 @@ import java.util.concurrent.ConcurrentHashMap;
  * RepositoryContentRequest
  *
  * @version $Id$
- *          <p/>
- *          plexus.component
- *          role="org.apache.maven.archiva.repository.RepositoryContentFactory"
  */
 @Service( "repositoryContentFactory#default" )
 public class RepositoryContentFactory
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java
index 3119f6b2a..df0005be6 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java
@@ -46,11 +46,6 @@ import java.util.Set;
  * ManagedDefaultRepositoryContent 
  *
  * @version $Id$
- * 
- * plexus.component
- *      role="org.apache.maven.archiva.repository.ManagedRepositoryContent"
- *      role-hint="default"
- *      instantiation-strategy="per-lookup"
  */
 @Service("managedRepositoryContent#default")
 @Scope("prototype")
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 6bbd61527..d1f00a71b 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
@@ -45,11 +45,6 @@ import java.util.Set;
  * @version $Id$
  * 
  * @todo no need to be a component when filetypes, legacy path parser is not
- * 
- * plexus.component
- *      role="org.apache.maven.archiva.repository.ManagedRepositoryContent"
- *      role-hint="legacy"
- *      instantiation-strategy="per-lookup"
  */
 @Service("managedRepositoryContent#legacy")
 @Scope("prototype")
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContent.java
index 62448eb6a..886b0415a 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContent.java
@@ -31,11 +31,6 @@ import org.springframework.stereotype.Service;
  * RemoteDefaultRepositoryContent
  *
  * @version $Id$
- *          <p/>
- *          plexus.component
- *          role="org.apache.maven.archiva.repository.RemoteRepositoryContent"
- *          role-hint="default"
- *          instantiation-strategy="per-lookup"
  */
 @Service( "remoteRepositoryContent#default" )
 @Scope( "prototype" )
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContent.java
index d93d0de4e..f6d946885 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContent.java
@@ -32,9 +32,6 @@ import org.springframework.stereotype.Service;
  *
  * @version $Id$
  * @todo no need to be a component once legacy path parser is not
- * plexus.component role="org.apache.maven.archiva.repository.RemoteRepositoryContent"
- * role-hint="legacy"
- * instantiation-strategy="per-lookup"
  */
 @Service( "remoteRepositoryContent#legacy" )
 @Scope( "prototype" )
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 48420f259..1b397c674 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
@@ -74,8 +74,6 @@ import java.util.regex.Matcher;
  * MetadataTools
  *
  * @version $Id$
- *          <p/>
- *          plexus.component role="org.apache.maven.archiva.repository.metadata.MetadataTools"
  */
 @Service( "metadataTools#default" )
 public class MetadataTools
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/MockConfiguration.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/MockConfiguration.java
index 713d5bb13..e460ed30d 100755
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/MockConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/MockConfiguration.java
@@ -35,9 +35,6 @@ import java.util.Set;
  * MockConfiguration 
  *
  * @version $Id$
- * 
- * plexus.component role="org.apache.maven.archiva.configuration.ArchivaConfiguration"
- *                   role-hint="mock"
  */
 @Service("archivaConfiguration#mock")
 public class MockConfiguration
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 cec42af4a..1f67853ff 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
@@ -39,7 +39,6 @@ import javax.inject.Inject;
  * DefaultRepositoryScanner
  *
  * @version $Id$
- * plexus.component role="org.apache.archiva.repository.scanner.RepositoryScanner"
  */
 @Service("repositoryScanner#default")
 public class DefaultRepositoryScanner
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java
index 874567d59..c4cc6fc46 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java
@@ -31,9 +31,6 @@ import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
  * SampleKnownConsumer 
  *
  * @version $Id$
- * 
- * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
- *                   role-hint="sample-known"
  */
 public class SampleKnownConsumer
   extends AbstractMonitoredConsumer