get RID of plexus.component annotation

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

9 files changed, 4 insertions, 19 deletions

diff --git a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java
index af2433968..e51ec85dc 100644
--- a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java
+++ b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java
@@ -36,11 +36,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * Generates RSS feeds.
- * 
- * plexus.component role="org.apache.archiva.rss.RssFeedGenerator"
- *      instantiation-strategy="per-lookup"
- * 
- * @version
+ *
  */
 @Service("rssFeedGenerator#default")
 @Scope("prototype")
diff --git a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java
index 0f2b7d593..a49f236ee 100644
--- a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java
+++ b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java
@@ -43,7 +43,6 @@ import java.util.TimeZone;
  * The artifacts will be grouped by the date when the artifacts were gathered.
  * Each group will appear as one entry in the feed.
  *
- * plexus.component role="org.apache.archiva.rss.processor.RssFeedProcessor" role-hint="new-artifacts"
  */
 @Service("rssFeedProcessor#new-artifacts")
 public class NewArtifactsRssFeedProcessor
diff --git a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java
index 4757c2855..285edcbdc 100644
--- a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java
+++ b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java
@@ -43,7 +43,6 @@ import java.util.Map;
  * generate a rss feed. The versions will be grouped by the date when the artifact
  * was gathered. Each group will appear as one entry in the feed.
  *
- * plexus.component role="org.apache.archiva.rss.processor.RssFeedProcessor" role-hint="new-versions"
  */
 @Service("rssFeedProcessor#new-versions")
 public class NewVersionsOfArtifactRssFeedProcessor
diff --git a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaServletAuthenticator.java b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaServletAuthenticator.java
index 8d00acb7e..dd384635b 100644
--- a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaServletAuthenticator.java
+++ b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaServletAuthenticator.java
@@ -39,8 +39,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 /**
- * @version
- * plexus.component role="org.apache.archiva.security.ServletAuthenticator" role-hint="default"
+ *
  */
 @Service("servletAuthenticator")
 public class ArchivaServletAuthenticator
diff --git a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
index 15b3e9120..4413df056 100644
--- a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
+++ b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
@@ -34,9 +34,6 @@ import javax.inject.Named;
  * ArchivaStandardRolesCheck tests for the existance of expected / standard roles and permissions. 
  *
  * @version $Id$
- * 
- * plexus.component role="org.codehaus.plexus.redback.system.check.EnvironmentCheck"
- *                   role-hint="required-roles"
  */
 @Service("environmentCheck#archiva-required-roles")
 public class ArchivaStandardRolesCheck
diff --git a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
index 983670f84..698a37520 100644
--- a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
+++ b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
@@ -43,7 +43,6 @@ import java.util.List;
  * DefaultUserRepositories
  *
  * @version $Id$
- *          plexus.component role="org.apache.archiva.security.UserRepositories" role-hint="default"
  */
 @Service( "userRepositories" )
 public class DefaultUserRepositories
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 5d97924f1..d6d324480 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
@@ -95,7 +95,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * plexus.component role="org.apache.maven.archiva.webdav.ArchivaDavResourceFactory"
+ *
  */
 @Service( "davResourceFactory#archiva" )
 public class ArchivaDavResourceFactory
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/MimeTypes.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/MimeTypes.java
index 99132a744..a9372a96e 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/MimeTypes.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/MimeTypes.java
@@ -42,8 +42,7 @@ import java.util.StringTokenizer;
  * MimeTypes 
  *
  * @version $Id: MimeTypes.java 7010 2007-10-25 23:35:02Z joakime $
- * 
- * plexus.component role="org.apache.maven.archiva.webdav.util.MimeTypes"
+ *
  */
 @Service("mimeTpes")
 public class MimeTypes
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/BypassSecuritySystem.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/BypassSecuritySystem.java
index 733679f87..ec0827b1d 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/BypassSecuritySystem.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/BypassSecuritySystem.java
@@ -43,9 +43,6 @@ import org.springframework.stereotype.Service;
  * for every request to respond as success / true. 
  *
  * @version $Id$
- * 
- * plexus.component
- *      role="org.codehaus.plexus.redback.system.SecuritySystem"
  */
 @Service("securitySystem#bypass")
 public class BypassSecuritySystem