get RID of plexus.requirement annotation

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

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTree.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTree.java
index 591d2df8f06e9db1f24a197ff9923cca6a9c6ee9..5afa4e2f19f9cfc71efedf6e28e4a6a83cdd1d73 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTree.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTree.java
@@ -48,15 +48,10 @@ public class DependencyTree
 {
     private Logger log = LoggerFactory.getLogger( DependencyTree.class );
 
-    /**
-     * plexus.requirement role-hint="maven2"
-     */
+
     @Inject
     private DependencyTreeBuilder dependencyTreeBuilder;
 
-    /**
-     * plexus.requirement
-     */
     @Inject
     private UserRepositories userRepositories;
 

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractActionSupport.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractActionSupport.java
index aced6a79c1f4a75515e3c79582d8c74d37d64d8c..78c5f851d57e9edecfa6b6e6496532178c0d5af9 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractActionSupport.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractActionSupport.java
@@ -56,15 +56,10 @@ public abstract class AbstractActionSupport
 \r
     protected Logger log = LoggerFactory.getLogger( getClass() );\r
 \r
-    /**\r
-     * plexus.requirement role="org.apache.archiva.audit.AuditListener"\r
-     */\r
     @Inject\r
     private List<AuditListener> auditListeners = new ArrayList<AuditListener>();\r
 \r
-    /**\r
-     * plexus.requirement\r
-     */\r
+\r
     @Inject\r
     @Named( value = "repositorySessionFactory" )\r
     protected RepositorySessionFactory repositorySessionFactory;\r

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractRepositoryBasedAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractRepositoryBasedAction.java
index 5bfcc036ece6c679cbba360f1a748d93344cbf4a..8232d6cf40f632df1036a08edb9aebcc4bcd5fd6 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractRepositoryBasedAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractRepositoryBasedAction.java
@@ -31,9 +31,7 @@ import java.util.List;
 public class AbstractRepositoryBasedAction
     extends AbstractActionSupport
 {
-    /**
-     * plexus.requirement
-     */
+
     @Inject
     private UserRepositories userRepositories;
 

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
index d8e82635e0a85e499bc40a22b9a6a920bb34397f..33c92ce2ed2f2db3190b0ce68bc42025af54fc7b 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
@@ -103,27 +103,15 @@ public class DeleteArtifactAction
      */
     private List<String> managedRepos;
 
-    /**
-     * plexus.requirement
-     */
     @Inject
     private UserRepositories userRepositories;
 
-    /**
-     * plexus.requirement role-hint="default"
-     */
     @Inject
     private ArchivaConfiguration configuration;
 
-    /**
-     * plexus.requirement
-     */
     @Inject
     private RepositoryContentFactory repositoryFactory;
 
-    /**
-     * plexus.requirement role="org.apache.archiva.repository.events.RepositoryListener"
-     */
     @Inject
     private List<RepositoryListener> listeners;
 

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java
index 510736d6ab1ed428922879aa0705d24ede0db1d6..0cf024eed70e17875f9aefadc853c68f11758617 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java
@@ -45,7 +45,7 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 /**
- * plexus.component role="com.opensymphony.xwork2.Action" role-hint="mergeAction" instantiation-strategy="per-lookup"
+ *
  */
 @Controller( "mergeAction" )
 @Scope( "prototype" )
@@ -54,16 +54,11 @@ public class MergeAction
     implements Validateable, Preparable, Auditable
 
 {
-    /**
-     * plexus.requirement role="org.apache.archiva.stagerepository.merge.RepositoryMerger" role-hint="maven2"
-     */
+
     @Inject
     @Named( value = "repositoryMerger#maven2" )
     private Maven2RepositoryMerger repositoryMerger;
 
-    /**
-     * plexus.requirement
-     */
     @Inject
     protected ArchivaConfiguration archivaConfiguration;
 

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
index 8a67e02a181f439338d7adb445eb8feb88cab1a4..53f1bdaefc2af8682262742a2673331a4263b605 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
@@ -61,8 +61,6 @@ import javax.inject.Inject;
  *
  * TODO change name to ShowVersionedAction to conform to terminology.
  *
- * plexus.component role="com.opensymphony.xwork2.Action" role-hint="showArtifactAction"
- * instantiation-strategy="per-lookup"
  */
 @SuppressWarnings( "serial" )
 @Controller( "showArtifactAction" )
@@ -73,9 +71,6 @@ public class ShowArtifactAction
 {
     /* .\ Not Exposed \._____________________________________________ */
 
-    /**
-     * plexus.requirement
-     */
     @Inject
     private RepositoryContentFactory repositoryFactory;
 

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
index d314ad29ef60e58189cc109f2ce0da5ccac3f7f1..ef7a42a755eb8a6bfa42258fc41d5c7cd485d647 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
@@ -76,8 +76,6 @@ import java.util.TimeZone;
 /**
  * Upload an artifact using Jakarta file upload in webwork. If set by the user a pom will also be generated. Metadata
  * will also be updated if one exists, otherwise it would be created.
- * <p/>
- * plexus.component role="com.opensymphony.xwork2.Action" role-hint="uploadAction" instantiation-strategy="per-lookup"
  */
 @SuppressWarnings( "serial" )
 @Controller( "uploadAction" )
@@ -136,27 +134,15 @@ public class UploadAction
      */
     private List<String> managedRepoIdList;
 
-    /**
-     * plexus.requirement
-     */
     @Inject
     private UserRepositories userRepositories;
 
-    /**
-     * plexus.requirement role-hint="default"
-     */
     @Inject
     private ArchivaConfiguration configuration;
 
-    /**
-     * plexus.requirement
-     */
     @Inject
     private RepositoryContentFactory repositoryFactory;
 
-    /**
-     * lexus.requirement role="org.apache.archiva.scheduler.ArchivaTaskScheduler" role-hint="repository"
-     */
     @Inject
     @Named( value = "archivaTaskScheduler#repository" )
     private ArchivaTaskScheduler scheduler;

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SystemStatusAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SystemStatusAction.java
index 4f471edf09bf23db082b5a05d7efa22555f37c5d..80b46b485e3e03b04d1200109ab1ac25193145a0 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SystemStatusAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SystemStatusAction.java
@@ -47,19 +47,11 @@ public class SystemStatusAction
     extends AbstractActionSupport
     implements SecureAction
 {
-    /**
-     * plexus.requirement role="org.codehaus.plexus.taskqueue.TaskQueue"
-     */
+
     private Map<String, TaskQueue> queues;
 
-    /**
-     * plexus.requirement role="org.codehaus.plexus.cache.Cache"
-     */
     private Map<String, Cache> caches;
 
-    /**
-     * plexus.requirement
-     */
     @Inject
     private RepositoryScanner scanner;
 

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java
index d232be262fde68a96bbfcd8e6634591a191cb84e..4d6b8c28aa07353bc8880381bdc923072b93cc55 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java
@@ -36,10 +36,7 @@ public abstract class AbstractAppearanceAction
     extends AbstractActionSupport
     implements Preparable
 {
-    /**
-     * Archiva Application Configuration
-     * plexus.requirement
-     */
+
     @Inject
     protected ArchivaConfiguration configuration;
 

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.java
index 1e6831196872e5b3e82132b7fecdae6b942ce05b..e5f05fdda4cefa5cc1c675ad712a215f26a91cca 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.java
@@ -48,34 +48,17 @@ public abstract class AbstractProxyConnectorFormAction
     implements Preparable
 {
 
-    /**
-     * plexus.requirement role="org.apache.maven.archiva.policies.PreDownloadPolicy"
-     */
+
     private Map<String, PreDownloadPolicy> preDownloadPolicyMap;
 
-    /**
-     * plexus.requirement role="org.apache.maven.archiva.policies.PostDownloadPolicy"
-     */
     private Map<String, PostDownloadPolicy> postDownloadPolicyMap;
 
-    /**
-     * plexus.requirement role="org.apache.maven.archiva.policies.DownloadErrorPolicy"
-     */
     private Map<String, DownloadErrorPolicy> downloadErrorPolicyMap;
 
-    /**
-     * The list of network proxy ids that are available.
-     */
     private List<String> proxyIdOptions;
 
-    /**
-     * The list of managed repository ids that are available.
-     */
     private List<String> managedRepoIdList;
 
-    /**
-     * The list of remove repository ids that are available.
-     */
     private List<String> remoteRepoIdList;
 
     /**

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java
index 1907a2399e2d6b79a5dee51fc41cb1b5cccebdc6..4b2735adbc3d8866ee8b2d524811539928128219 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java
@@ -49,15 +49,10 @@ public class AddLegacyArtifactPathAction
     extends AbstractActionSupport
     implements Preparable, Validateable
 {
-    /**
-     * plexus.requirement
-     */
+
     @Inject
     private ArchivaConfiguration archivaConfiguration;
 
-    /**
-     * plexus.requirement role-hint="legacy"
-     */
     @Inject
     @Named(value = "managedRepositoryContent#legacy")
     private ManagedRepositoryContent repositoryContent;

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java
index c9aab90e312b76ea7709a5a865d9b4c80ee8004b..430a917d8692b9c032f2313f069b526d31d26535 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java
@@ -35,16 +35,13 @@ import java.util.Iterator;
  * Delete a LegacyArtifactPath to archiva configuration\r
  *\r
  * @since 1.1\r
- *        plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteLegacyArtifactPathAction" instantiation-strategy="per-lookup"\r
  */\r
 @Controller( "deleteLegacyArtifactPathAction" )\r
 @Scope( "prototype" )\r
 public class DeleteLegacyArtifactPathAction\r
     extends AbstractActionSupport\r
 {\r
-    /**\r
-     * plexus.requirement\r
-     */\r
+\r
     @Inject\r
     private ArchivaConfiguration archivaConfiguration;\r
 \r

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java
index 05912417444e6b8fe938358c57694d65b1ac74e7..9d2f4f0e2037d194dd873271b36cd8e9d4ca914c 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java
@@ -47,8 +47,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * plexus.component role="com.opensymphony.xwork2.Action" role-hint="viewAuditLogReport"
- * instantiation-strategy="per-lookup"
+ *
  */
 @Controller( "viewAuditLogReport" )
 @Scope( "prototype" )
@@ -58,12 +57,12 @@ public class ViewAuditLogReportAction
 {
     protected HttpServletRequest request;
 
-    /**
-     * plexus.requirement
-     */
     @Inject
     private UserRepositories userRepositories;
 
+    @Inject
+    private AuditManager auditManager;
+
     private String repository;
 
     private List<String> repositories;
@@ -95,14 +94,10 @@ public class ViewAuditLogReportAction
     private static final String HEADER_RESULTS = "Results";
 
     private String[] datePatterns =
-        new String[]{ "MM/dd/yy", "MM/dd/yyyy", "MMMMM/dd/yyyy", "MMMMM/dd/yy", "dd MMMMM yyyy", "dd/MM/yy",
-            "dd/MM/yyyy", "yyyy/MM/dd", "yyyy-MM-dd", "yyyy-dd-MM", "MM-dd-yyyy", "MM-dd-yy" };
+    new String[]{ "MM/dd/yy", "MM/dd/yyyy", "MMMMM/dd/yyyy", "MMMMM/dd/yy", "dd MMMMM yyyy", "dd/MM/yy",
+    "dd/MM/yyyy", "yyyy/MM/dd", "yyyy-MM-dd", "yyyy-dd-MM", "MM-dd-yyyy", "MM-dd-yy" };
+
 
-    /**
-     * plexus.requirement
-     */
-    @Inject
-    private AuditManager auditManager;
 
     public SecureActionBundle getSecureActionBundle()
         throws SecureActionException