Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

get RID of plexus.requirement annotation 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1165523 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-09-06 07:22:48 +00:00
parent 113fa60beb
commit 3929d7d7df
13 changed files with 17 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTree.java
View File

@ -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;

7
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractActionSupport.java
View File

@ -56,15 +56,10 @@ public abstract class AbstractActionSupport
protected Logger log = LoggerFactory.getLogger( getClass() );
/**
* plexus.requirement role="org.apache.archiva.audit.AuditListener"
*/
@Inject
private List<AuditListener> auditListeners = new ArrayList<AuditListener>();
/**
* plexus.requirement
*/
@Inject
@Named( value = "repositorySessionFactory" )
protected RepositorySessionFactory repositorySessionFactory;

4
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractRepositoryBasedAction.java
View File

@ -31,9 +31,7 @@ import java.util.List;
public class AbstractRepositoryBasedAction
extends AbstractActionSupport
{
/**
* plexus.requirement
*/
@Inject
private UserRepositories userRepositories;

12
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
View File

@ -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;

9
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java
View File

@ -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;

5
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
View File

@ -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;

14
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
View File

@ -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;

10
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SystemStatusAction.java
View File

@ -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;

5
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java
View File

@ -36,10 +36,7 @@ public abstract class AbstractAppearanceAction
extends AbstractActionSupport
implements Preparable
{
/**
* Archiva Application Configuration
* plexus.requirement
*/
@Inject
protected ArchivaConfiguration configuration;

19
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.java
View File

@ -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;
/**

7
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java
View File

@ -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;

5
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java
View File

@ -35,16 +35,13 @@ import java.util.Iterator;
* Delete a LegacyArtifactPath to archiva configuration
*
* @since 1.1
* plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteLegacyArtifactPathAction" instantiation-strategy="per-lookup"
*/
@Controller( "deleteLegacyArtifactPathAction" )
@Scope( "prototype" )
public class DeleteLegacyArtifactPathAction
extends AbstractActionSupport
{
/**
* plexus.requirement
*/
@Inject
private ArchivaConfiguration archivaConfiguration;

19
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java
View File

@ -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