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@1165558 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-09-06 08:11:21 +00:00
parent 4793abbccc
commit ac4dbb87e1
36 changed files with 102 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
View File

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

5
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
View File

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

2
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java
View File

@ -60,7 +60,7 @@ public class FileTypes
public static final String IGNORED = "ignored";
/**
* plexus.requirement
*
*/
@Inject
@Named( value = "archivaConfiguration#default" )

4
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
View File

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

8
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
View File

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

4
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
View File

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

16
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
View File

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

4
archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
View File

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

9
archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
View File

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

4
archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
View File

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

2
archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java
View File

@ -56,7 +56,7 @@ public class CachedFailuresPolicy
public static final String YES = "yes";
/**
* plexus.requirement
*
*/
@Inject
private UrlFailureCache urlFailureCache;

21
archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
View File

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

2
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryContentFactory.java
View File

@ -43,7 +43,7 @@ public class RepositoryContentFactory
implements RegistryListener
{
/**
* plexus.requirement
*
*/
@Inject
private ArchivaConfiguration archivaConfiguration;

8
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java
View File

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

2
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java
View File

@ -51,7 +51,7 @@ public abstract class AbstractLegacyRepositoryContent
}
/**
* plexus.requirement role-hint="legacy"
*
*/
@Inject
@Named( value = "pathParser#legacy" )

2
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java
View File

@ -53,7 +53,7 @@ public class ManagedLegacyRepositoryContent
implements ManagedRepositoryContent
{
/**
* plexus.requirement
*
*/
@Inject
private FileTypes filetypes;

4
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java
View File

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

4
archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
View File

@ -45,13 +45,13 @@ public class DefaultRepositoryScanner
implements RepositoryScanner
{
/**
* plexus.requirement
*
*/
@Inject
private FileTypes filetypes;
/**
* plexus.requirement
*
*/
@Inject
private RepositoryContentConsumers consumerUtil;

2
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
View File

@ -66,7 +66,7 @@ public class ArchivaIndexingTaskExecutor
private Logger log = LoggerFactory.getLogger( ArchivaIndexingTaskExecutor.class );
/**
* plexus.requirement
*
*/
private IndexPacker indexPacker;

2
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java
View File

@ -41,7 +41,7 @@ public class IndexingArchivaTaskScheduler
private Logger log = LoggerFactory.getLogger( IndexingArchivaTaskScheduler.class );
/**
* plexus.requirement role-hint="indexing"
*
*/
@Inject
@Named(value = "taskQueue#indexing")

9
archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
View File

@ -59,7 +59,7 @@ public class ArchivaRepositoryScanningTaskExecutor
private Logger log = LoggerFactory.getLogger( ArchivaRepositoryScanningTaskExecutor.class );
/**
* plexus.requirement
*
*/
@Inject
@Named(value="archivaConfiguration#default")
@ -68,13 +68,13 @@ public class ArchivaRepositoryScanningTaskExecutor
/**
* The repository scanner component.
*
* plexus.requirement
*
*/
@Inject
private RepositoryScanner repoScanner;
/**
* plexus.requirement
*
*/
@Inject
private RepositoryContentConsumers consumers;
@ -82,7 +82,7 @@ public class ArchivaRepositoryScanningTaskExecutor
private Task task;
/**
* plexus.requirement
*
*/
@Inject
private RepositoryStatisticsManager repositoryStatisticsManager;
@ -90,7 +90,6 @@ public class ArchivaRepositoryScanningTaskExecutor
/**
* TODO: may be different implementations
*
* plexus.requirement
*/
@Inject
private RepositorySessionFactory repositorySessionFactory;

11
archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java
View File

@ -64,7 +64,7 @@ public class RepositoryArchivaTaskScheduler
private Logger log = LoggerFactory.getLogger( RepositoryArchivaTaskScheduler.class );
/**
* plexus.requirement
*
*/
@Inject
private Scheduler scheduler;
@ -73,20 +73,20 @@ public class RepositoryArchivaTaskScheduler
private CronExpressionValidator cronValidator;
/**
* plexus.requirement role-hint="repository-scanning"
*
*/
@Inject
@Named( value = "taskQueue#repository-scanning" )
private TaskQueue repositoryScanningQueue;
/**
* plexus.requirement
*
*/
@Inject
private ArchivaConfiguration archivaConfiguration;
/**
* plexus.requirement
*
*/
@Inject
@Named( value = "repositoryStatisticsManager#default" )
@ -94,8 +94,7 @@ public class RepositoryArchivaTaskScheduler
/**
* TODO: could have multiple implementations
* <p/>
* plexus.requirement
*
*/
@Inject
private RepositorySessionFactory repositorySessionFactory;

2
archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java
View File

@ -55,7 +55,7 @@ public class NewArtifactsRssFeedProcessor
private static final String desc = "These are the new artifacts found in the repository ";
/**
* plexus.requirement
*
*/
@Inject
private RssFeedGenerator generator;

2
archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java
View File

@ -55,7 +55,7 @@ public class NewVersionsOfArtifactRssFeedProcessor
private static final String desc = "These are the new versions of artifact ";
/**
* plexus.requirement
*
*/
@Inject
private RssFeedGenerator generator;

2
archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaServletAuthenticator.java
View File

@ -48,7 +48,7 @@ public class ArchivaServletAuthenticator
private Logger log = LoggerFactory.getLogger( ArchivaServletAuthenticator.class );
/**
* plexus.requirement
*
*/
@Inject
private SecuritySystem securitySystem;

2
archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
View File

@ -42,7 +42,7 @@ public class ArchivaStandardRolesCheck
private Logger log = LoggerFactory.getLogger( ArchivaStandardRolesCheck.class );
/**
* plexus.requirement role-hint="cached"
*
*/
@Inject @Named(value = "rBACManager#cached")
private RBACManager rbacManager;

6
archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
View File

@ -49,19 +49,19 @@ public class DefaultUserRepositories
implements UserRepositories
{
/**
* plexus.requirement
*
*/
@Inject
private SecuritySystem securitySystem;
/**
* plexus.requirement role-hint="default"
*
*/
@Inject
private RoleManager roleManager;
/**
* plexus.requirement
*
*/
@Inject
private ArchivaConfiguration archivaConfiguration;

26
archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
View File

@ -108,54 +108,54 @@ public class ArchivaDavResourceFactory
private Logger log = LoggerFactory.getLogger( ArchivaDavResourceFactory.class );
/**
* plexus.requirement role="org.apache.archiva.audit.AuditListener"
*
*/
@Inject
private List<AuditListener> auditListeners = new ArrayList<AuditListener>();
/**
* plexus.requirement
*
*/
@Inject
private RepositoryContentFactory repositoryFactory;
/**
* plexus.requirement
*
*/
private RepositoryRequest repositoryRequest;
/**
* plexus.requirement role-hint="default"
*
*/
@Inject
@Named( value = "repositoryProxyConnectors#default" )
private RepositoryProxyConnectors connectors;
/**
* plexus.requirement
*
*/
@Inject
private MetadataTools metadataTools;
/**
* plexus.requirement
*
*/
@Inject
private MimeTypes mimeTypes;
/**
* plexus.requirement
*
*/
private ArchivaConfiguration archivaConfiguration;
/**
* plexus.requirement
*
*/
@Inject
private ServletAuthenticator servletAuth;
/**
* plexus.requirement role-hint="basic"
*
*/
@Inject
@Named( value = "httpAuthenticator#basic" )
@ -167,22 +167,22 @@ public class ArchivaDavResourceFactory
private final LockManager lockManager = new SimpleLockManager();
/**
* plexus.requirement
*
*/
private ChecksumFile checksum;
/**
* plexus.requirement role-hint="sha1"
*
*/
private Digester digestSha1;
/**
* plexus.requirement role-hint="md5";
*
*/
private Digester digestMd5;
/**
* plexus.requirement role="org.apache.archiva.scheduler.ArchivaTaskScheduler" role-hint="repository"
*
*/
@Inject
@Named( value = "archivaTaskScheduler#repository" )

11
archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
View File

@ -72,27 +72,22 @@ public class DefaultMetadataResolver
* ... could be a different type since we need methods to modify the storage metadata, which would also allow more
* appropriate methods to pass in the already determined repository configuration, for example, instead of the ID
*
* plexus.requirement role-hint="maven2"
*
*/
@Inject
@Named( value = "repositoryStorage#maven2" )
private RepositoryStorage repositoryStorage;
/**
* plexus.requirement role="org.apache.archiva.repository.events.RepositoryListener"
*
*/
@Inject
private List<RepositoryListener> listeners;
//@Inject
//private ApplicationContext applicationContext;
@PostConstruct
private void initialize()
{
//listeners =
// new ArrayList<RepositoryListener>( applicationContext.getBeansOfType( RepositoryListener.class ).values() );
// no op
}
public ProjectVersionMetadata resolveProjectVersion( RepositorySession session, String repoId, String namespace,

4
archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java
View File

@ -38,7 +38,7 @@ public class MetadataAuditListener
private static final Logger log = LoggerFactory.getLogger( MetadataAuditListener.class );
/**
* plexus.requirement
*
*/
@Inject
private AuditManager auditManager;
@ -47,7 +47,7 @@ public class MetadataAuditListener
* FIXME: this could be multiple implementations and needs to be configured. It also starts a separate session to
* the originator of the audit event that we may rather want to pass through.
*
* plexus.requirement
*
*/
@Inject
private RepositorySessionFactory repositorySessionFactory;

13
archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
View File

@ -103,37 +103,36 @@ public class DefaultDependencyTreeBuilder
private Logger log = LoggerFactory.getLogger( getClass() );
/**
* plexus.requirement
*
*/
private ArtifactFactory factory;
/**
* plexus.requirement
*
*/
private ArtifactCollector collector;
/**
* plexus.requirement
*
*/
private ModelBuilder builder;
/**
* TODO: can have other types, and this might eventually come through from the main request
* <p/>
* plexus.requirement
*
*/
@Inject
private RepositorySessionFactory repositorySessionFactory;
/**
* plexus.requirement role-hint="maven2"
*
*/
@Inject
@Named( value = "repositoryPathTranslator#maven2" )
private RepositoryPathTranslator pathTranslator;
/**
* plexus.requirement
*
*/
@Inject
@Named( value = "archivaConfiguration#default" )

6
archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
View File

@ -88,19 +88,19 @@ public class Maven2RepositoryStorage
implements RepositoryStorage
{
/**
* plexus.requirement
*
*/
private ModelBuilder builder;
/**
* plexus.requirement
*
*/
@Inject
@Named( value = "archivaConfiguration#default" )
private ArchivaConfiguration archivaConfiguration;
/**
* plexus.requirement role-hint="maven2"
*
*/
@Inject
@Named( value = "repositoryPathTranslator#maven2" )

6
archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java
View File

@ -43,19 +43,19 @@ public class FileRepositorySessionFactory
implements RepositorySessionFactory
{
/**
* plexus.requirement role="org.apache.archiva.metadata.model.MetadataFacetFactory"
*
*/
private Map<String, MetadataFacetFactory> metadataFacetFactories;
/**
* plexus.requirement
*
*/
@Inject
@Named( value = "archivaConfiguration#default" )
private ArchivaConfiguration configuration;
/**
* plexus.requirement
*
*/
@Inject
private MetadataResolver metadataResolver;

6
archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
View File

@ -47,18 +47,18 @@ public class JcrRepositorySessionFactory
private ApplicationContext applicationContext;
/**
* plexus.requirement role="org.apache.archiva.metadata.model.MetadataFacetFactory"
*
*/
private Map<String, MetadataFacetFactory> metadataFacetFactories;
/**
* plexus.requirement
*
*/
@Inject
private Repository repository;
/**
* plexus.requirement
*
*/
@Inject
private MetadataResolver metadataResolver;

10
archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
View File

@ -79,21 +79,20 @@ public class DuplicateArtifactsConsumer
private String description = "Check for Duplicate Artifacts via SHA1 Checksums";
/**
* plexus.requirement
*
*/
@Inject
private ArchivaConfiguration configuration;
/**
* plexus.requirement
*
*/
@Inject
private FileTypes filetypes;
/**
* FIXME: can be of other types
* <p/>
* plexus.requirement
*
*/
@Inject
private RepositorySessionFactory repositorySessionFactory;
@ -106,8 +105,7 @@ public class DuplicateArtifactsConsumer
/**
* FIXME: needs to be selected based on the repository in question
* <p/>
* plexus.requirement role-hint="maven2"
*
*/
@Inject
@Named( value = "repositoryPathTranslator#maven2" )

4
archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
View File

@ -60,12 +60,12 @@ public class Maven2RepositoryMerger
implements RepositoryMerger
{
/**
* plexus.requirement role-hint="default"
*
*/
private ArchivaConfiguration configuration;
/**
* plexus.requirement role-hint="maven2"
*
*/
private RepositoryPathTranslator pathTranslator;