From ac4dbb87e1dabcc01722715bce8f38feb0970102 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 6 Sep 2011 08:11:21 +0000 Subject: [PATCH] get RID of plexus.requirement annotation git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1165558 13f79535-47bb-0310-9956-ffa450edef68 --- .../artifact/LegacyToDefaultConverter.java | 8 +++--- .../DefaultArchivaConfiguration.java | 5 +--- .../archiva/configuration/FileTypes.java | 2 +- .../consumers/core/AutoRemoveConsumer.java | 4 +-- .../core/MetadataUpdaterConsumer.java | 8 +++--- .../core/ValidateChecksumConsumer.java | 4 +-- .../repository/RepositoryPurgeConsumer.java | 16 +++++------- .../ArchivaMetadataCreationConsumer.java | 4 --- .../DefaultLegacyRepositoryConverter.java | 9 +++---- .../LegacyConverterArtifactConsumer.java | 4 +-- .../policies/CachedFailuresPolicy.java | 2 +- .../DefaultRepositoryProxyConnectors.java | 21 +++++++-------- .../repository/RepositoryContentFactory.java | 2 +- .../AbstractDefaultRepositoryContent.java | 8 ++---- .../AbstractLegacyRepositoryContent.java | 2 +- .../ManagedLegacyRepositoryContent.java | 2 +- .../repository/metadata/MetadataTools.java | 4 +-- .../scanner/DefaultRepositoryScanner.java | 4 +-- .../indexing/ArchivaIndexingTaskExecutor.java | 2 +- .../IndexingArchivaTaskScheduler.java | 2 +- ...ArchivaRepositoryScanningTaskExecutor.java | 9 +++---- .../RepositoryArchivaTaskScheduler.java | 11 ++++---- .../NewArtifactsRssFeedProcessor.java | 2 +- ...NewVersionsOfArtifactRssFeedProcessor.java | 2 +- .../security/ArchivaServletAuthenticator.java | 2 +- .../security/ArchivaStandardRolesCheck.java | 2 +- .../security/DefaultUserRepositories.java | 6 ++--- .../webdav/ArchivaDavResourceFactory.java | 26 +++++++++---------- .../repository/DefaultMetadataResolver.java | 11 +++----- .../archiva/audit/MetadataAuditListener.java | 4 +-- .../maven2/DefaultDependencyTreeBuilder.java | 13 +++++----- .../maven2/Maven2RepositoryStorage.java | 6 ++--- .../file/FileRepositorySessionFactory.java | 6 ++--- .../jcr/JcrRepositorySessionFactory.java | 6 ++--- .../consumers/DuplicateArtifactsConsumer.java | 10 +++---- .../merge/Maven2RepositoryMerger.java | 4 +-- 36 files changed, 102 insertions(+), 131 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 158220483..268667b49 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 @@ -75,7 +75,7 @@ public class LegacyToDefaultConverter { /** * {@link List}<{@link Digester} - * plexus.requirement role="org.codehaus.plexus.digest.Digester" + * */ private List 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; 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 6cfe80c66..34f72d808 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 @@ -94,8 +94,7 @@ public class DefaultArchivaConfiguration /** * Plexus registry to read the configuration from. - *

- * 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 */ 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 c15239a5d..80d04af87 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 @@ -60,7 +60,7 @@ public class FileTypes public static final String IGNORED = "ignored"; /** - * plexus.requirement + * */ @Inject @Named( value = "archivaConfiguration#default" ) 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 8c3dab815..751998a34 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 @@ -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; 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 a3a6a7a13..2189a0bfa 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 @@ -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; 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 cea01ef7c..b0adf3aa5 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 @@ -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 allDigesters; 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 e8bb7697f..a690d1566 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 @@ -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 listeners = Collections.emptyList(); /** * TODO: this could be multiple implementations and needs to be configured. - *

- * plexus.requirement + * */ @Inject private RepositorySessionFactory repositorySessionFactory; 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 6ab572662..f526cb2a9 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 @@ -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") 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 6ca889735..02950448b 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 @@ -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; 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 a86473ba2..92a7d0cc6 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 @@ -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; 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 109c78202..45385b353 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 @@ -56,7 +56,7 @@ public class CachedFailuresPolicy public static final String YES = "yes"; /** - * plexus.requirement + * */ @Inject private UrlFailureCache urlFailureCache; 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 ad667a46d..4d400b8d6 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 @@ -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 preDownloadPolicies; /** - * plexus.requirement role="org.apache.maven.archiva.policies.PostDownloadPolicy" + * */ @Inject private Map postDownloadPolicies; /** - * plexus.requirement role="org.apache.maven.archiva.policies.DownloadErrorPolicy" + * */ @Inject private Map downloadErrorPolicies; /** - * plexus.requirement role-hint="default" + * */ @Inject private UrlFailureCache urlFailureCache; @@ -147,13 +144,13 @@ public class DefaultRepositoryProxyConnectors private Map networkProxyMap = new HashMap(); /** - * plexus.requirement + * */ @Inject private WagonFactory wagonFactory; /** - * plexus.requirement role="org.apache.archiva.scheduler.ArchivaTaskScheduler" role-hint="repository" + * */ @Inject @Named( value = "archivaTaskScheduler#repository" ) 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 22e301c8a..af79060b6 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 @@ -43,7 +43,7 @@ public class RepositoryContentFactory implements RegistryListener { /** - * plexus.requirement + * */ @Inject private ArchivaConfiguration archivaConfiguration; diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java index 062dd7d13..a691b13e4 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractDefaultRepositoryContent.java @@ -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 artifactMappingProviders; - //@Inject - //protected ApplicationContext applicationContext; - @PostConstruct protected void initialize() { - //artifactMappingProviders = new ArrayList( - // applicationContext.getBeansOfType( ArtifactMappingProvider.class ).values() ); + // no op } public ArtifactReference toArtifactReference( String path ) diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java index e32d8d2d6..e29cd4814 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java @@ -51,7 +51,7 @@ public abstract class AbstractLegacyRepositoryContent } /** - * plexus.requirement role-hint="legacy" + * */ @Inject @Named( value = "pathParser#legacy" ) 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 d1f00a71b..45b5d77aa 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 @@ -53,7 +53,7 @@ public class ManagedLegacyRepositoryContent implements ManagedRepositoryContent { /** - * plexus.requirement + * */ @Inject private FileTypes filetypes; 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 1b397c674..ace302fcb 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 @@ -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") 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 1f67853ff..6185efe91 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 @@ -45,13 +45,13 @@ public class DefaultRepositoryScanner implements RepositoryScanner { /** - * plexus.requirement + * */ @Inject private FileTypes filetypes; /** - * plexus.requirement + * */ @Inject private RepositoryContentConsumers consumerUtil; diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java index 4db22d9e7..527fa8bce 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java @@ -66,7 +66,7 @@ public class ArchivaIndexingTaskExecutor private Logger log = LoggerFactory.getLogger( ArchivaIndexingTaskExecutor.class ); /** - * plexus.requirement + * */ private IndexPacker indexPacker; diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java index 4d2c20030..ddf5ead7e 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java @@ -41,7 +41,7 @@ public class IndexingArchivaTaskScheduler private Logger log = LoggerFactory.getLogger( IndexingArchivaTaskScheduler.class ); /** - * plexus.requirement role-hint="indexing" + * */ @Inject @Named(value = "taskQueue#indexing") diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java index 6eae172fb..a8a7a4c37 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java @@ -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; diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java index 634e5edd3..c9cb9b24c 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java @@ -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 - *

- * plexus.requirement + * */ @Inject private RepositorySessionFactory repositorySessionFactory; 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 a49f236ee..90d983a5f 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 @@ -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; 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 285edcbdc..a41c0df5c 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 @@ -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; 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 dd384635b..3d76e8427 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 @@ -48,7 +48,7 @@ public class ArchivaServletAuthenticator private Logger log = LoggerFactory.getLogger( ArchivaServletAuthenticator.class ); /** - * plexus.requirement + * */ @Inject private SecuritySystem securitySystem; 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 4413df056..42b022902 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 @@ -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; 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 698a37520..e7c700c8f 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 @@ -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; 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 d6d324480..18b3a23ca 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 @@ -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 auditListeners = new ArrayList(); /** - * 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" ) diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java index f9d70a3d7..0c6ce56dc 100644 --- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java +++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java @@ -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 listeners; - - //@Inject - //private ApplicationContext applicationContext; - @PostConstruct private void initialize() { - //listeners = - // new ArrayList( applicationContext.getBeansOfType( RepositoryListener.class ).values() ); + // no op } public ProjectVersionMetadata resolveProjectVersion( RepositorySession session, String repoId, String namespace, diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java index 205faec40..514ab2150 100644 --- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java +++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java @@ -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; diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java index 6728bc93b..8a78ed3d6 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java @@ -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 - *

- * 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" ) diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java index 7b3a0952b..f3473db7c 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java @@ -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" ) diff --git a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java index a43c38f87..1caae4eca 100644 --- a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java +++ b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java @@ -43,19 +43,19 @@ public class FileRepositorySessionFactory implements RepositorySessionFactory { /** - * plexus.requirement role="org.apache.archiva.metadata.model.MetadataFacetFactory" + * */ private Map metadataFacetFactories; /** - * plexus.requirement + * */ @Inject @Named( value = "archivaConfiguration#default" ) private ArchivaConfiguration configuration; /** - * plexus.requirement + * */ @Inject private MetadataResolver metadataResolver; diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java index 9c2b69aa5..7c7f45861 100644 --- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java +++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java @@ -47,18 +47,18 @@ public class JcrRepositorySessionFactory private ApplicationContext applicationContext; /** - * plexus.requirement role="org.apache.archiva.metadata.model.MetadataFacetFactory" + * */ private Map metadataFacetFactories; /** - * plexus.requirement + * */ @Inject private Repository repository; /** - * plexus.requirement + * */ @Inject private MetadataResolver metadataResolver; diff --git a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java index fa221d022..969aab369 100644 --- a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java +++ b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java @@ -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 - *

- * plexus.requirement + * */ @Inject private RepositorySessionFactory repositorySessionFactory; @@ -106,8 +105,7 @@ public class DuplicateArtifactsConsumer /** * FIXME: needs to be selected based on the repository in question - *

- * plexus.requirement role-hint="maven2" + * */ @Inject @Named( value = "repositoryPathTranslator#maven2" ) diff --git a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java index 7a97691c0..863fdfa5f 100644 --- a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java +++ b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java @@ -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; -- 2.39.5