From f0c6ee5a718f8d0f19bf9efc0f390c5b5e46dc1b Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 6 Sep 2011 07:26:05 +0000 Subject: [PATCH] get RID of plexus.component annotation git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1165527 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/archiva/cli/ArtifactCountConsumer.java | 3 --- .../converter/artifact/LegacyToDefaultConverter.java | 2 -- .../archiva/configuration/DefaultArchivaConfiguration.java | 2 -- .../org/apache/maven/archiva/configuration/FileTypes.java | 2 -- .../maven/archiva/consumers/core/AutoRemoveConsumer.java | 3 --- .../maven/archiva/consumers/core/AutoRenameConsumer.java | 3 --- .../archiva/consumers/core/MetadataUpdaterConsumer.java | 3 --- .../archiva/consumers/core/ValidateChecksumConsumer.java | 3 --- .../consumers/core/repository/RepositoryPurgeConsumer.java | 4 ---- .../metadata/ArchivaMetadataCreationConsumer.java | 2 -- .../converter/legacy/DefaultLegacyRepositoryConverter.java | 1 - .../converter/legacy/LegacyConverterArtifactConsumer.java | 4 ---- .../maven/archiva/policies/CachedFailuresPolicy.java | 2 -- .../org/apache/maven/archiva/policies/ChecksumPolicy.java | 3 --- .../archiva/policies/PropagateErrorsDownloadPolicy.java | 3 --- .../policies/PropagateErrorsOnUpdateDownloadPolicy.java | 3 --- .../org/apache/maven/archiva/policies/ReleasesPolicy.java | 3 --- .../org/apache/maven/archiva/policies/SnapshotsPolicy.java | 3 --- .../archiva/proxy/DefaultRepositoryProxyConnectors.java | 1 - .../org/apache/maven/archiva/proxy/MockConfiguration.java | 3 --- .../maven/archiva/repository/RepositoryContentFactory.java | 3 --- .../content/ManagedDefaultRepositoryContent.java | 5 ----- .../repository/content/ManagedLegacyRepositoryContent.java | 5 ----- .../repository/content/RemoteDefaultRepositoryContent.java | 5 ----- .../repository/content/RemoteLegacyRepositoryContent.java | 3 --- .../maven/archiva/repository/metadata/MetadataTools.java | 2 -- .../apache/maven/archiva/repository/MockConfiguration.java | 3 --- .../repository/scanner/DefaultRepositoryScanner.java | 1 - .../archiva/repository/scanner/SampleKnownConsumer.java | 3 --- .../scheduler/indexing/ArchivaIndexingTaskExecutor.java | 4 +--- .../scheduler/indexing/IndexingArchivaTaskScheduler.java | 1 - .../repository/ArchivaRepositoryScanningTaskExecutor.java | 2 -- .../repository/RepositoryArchivaTaskScheduler.java | 2 -- .../main/java/org/apache/archiva/rss/RssFeedGenerator.java | 6 +----- .../rss/processor/NewArtifactsRssFeedProcessor.java | 1 - .../processor/NewVersionsOfArtifactRssFeedProcessor.java | 1 - .../archiva/security/ArchivaServletAuthenticator.java | 3 +-- .../apache/archiva/security/ArchivaStandardRolesCheck.java | 3 --- .../apache/archiva/security/DefaultUserRepositories.java | 1 - .../maven/archiva/webdav/ArchivaDavResourceFactory.java | 2 +- .../org/apache/maven/archiva/webdav/util/MimeTypes.java | 3 +-- .../apache/maven/archiva/webdav/BypassSecuritySystem.java | 3 --- .../metadata/repository/DefaultMetadataResolver.java | 1 - .../java/org/apache/archiva/audit/AuditEventFactory.java | 2 +- .../src/main/java/org/apache/archiva/audit/AuditLog.java | 2 +- .../java/org/apache/archiva/audit/DefaultAuditManager.java | 2 +- .../org/apache/archiva/audit/MetadataAuditListener.java | 2 +- archiva-modules/plugins/generic-metadata-support/pom.xml | 6 ++++-- .../metadata/generic/GenericMetadataFacetFactory.java | 4 ++-- .../tree/maven2/DefaultDependencyTreeBuilder.java | 2 -- .../storage/maven2/DefaultArtifactMappingProvider.java | 2 +- .../storage/maven2/DummyLifecycleBindingsInjector.java | 2 +- .../storage/maven2/Maven2RepositoryPathTranslator.java | 7 ++----- .../repository/storage/maven2/Maven2RepositoryStorage.java | 1 - .../storage/maven2/MavenArtifactFacetFactory.java | 2 +- .../storage/maven2/MavenProjectFacetFactory.java | 2 +- .../repository/file/FileRepositorySessionFactory.java | 2 +- .../repository/jcr/JcrRepositorySessionFactory.java | 2 +- archiva-modules/plugins/npanday-support/pom.xml | 4 ++++ .../plugins/npanday/NPandayArtifactMappingProvider.java | 3 ++- .../archiva/reports/RepositoryProblemEventListener.java | 3 +-- .../archiva/reports/RepositoryProblemFacetFactory.java | 2 +- .../reports/consumers/DuplicateArtifactsConsumer.java | 3 --- .../stats/DefaultRepositoryStatisticsManager.java | 2 +- .../repository/stats/RepositoryStatisticsFactory.java | 2 +- .../stagerepository/merge/Maven2RepositoryMerger.java | 2 +- 66 files changed, 34 insertions(+), 143 deletions(-) diff --git a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArtifactCountConsumer.java b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArtifactCountConsumer.java index dc4ef7814..8c7c4ed89 100644 --- a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArtifactCountConsumer.java +++ b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArtifactCountConsumer.java @@ -30,9 +30,6 @@ import java.util.List; * ArtifactCountConsumer * * @version $Id$ - * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer" - * role-hint="count-artifacts" - * instantiation-strategy="per-lookup" */ @Service("knownRepositoryContentConsumer#count-artifacts") @Scope("prototype") 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 712f8a6f2..158220483 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 @@ -68,8 +68,6 @@ import java.util.regex.Matcher; * LegacyToDefaultConverter * * @version $Id$ - * @plexus.component role="org.apache.maven.archiva.converter.artifact.ArtifactConverter" - * role-hint="legacy-to-default" */ @Service( "artifactConverter#legacy-to-default" ) public class LegacyToDefaultConverter 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 e0a5b875a..6cfe80c66 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 @@ -85,8 +85,6 @@ import java.util.Set; * If the configuration is outdated, it will be upgraded when it is loaded. This is done by checking the version flag * before reading it from the registry. *

- *

- * plexus.component role="org.apache.maven.archiva.configuration.ArchivaConfiguration" */ @Service( "archivaConfiguration#default" ) public class DefaultArchivaConfiguration 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 cf1c57720..c15239a5d 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 @@ -46,8 +46,6 @@ import java.util.Map; * FileTypes * * @version $Id$ - *

- * plexus.component role="org.apache.maven.archiva.configuration.FileTypes" */ @Service( "fileTypes" ) public class FileTypes 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 325581c9c..8c3dab815 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 @@ -44,9 +44,6 @@ import java.util.List; * AutoRemoveConsumer * * @version $Id$ - * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer" - * role-hint="auto-remove" - * instantiation-strategy="per-lookup" */ @Service("knownRepositoryContentConsumer#auto-remove") @Scope("prototype") diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java index 9ec80bce6..09dd5ca33 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java @@ -40,9 +40,6 @@ import java.util.Map; * AutoRenameConsumer * * @version $Id$ - * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer" - * role-hint="auto-rename" - * instantiation-strategy="per-lookup" */ @Service("knownRepositoryContentConsumer#auto-rename") @Scope("prototype") 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 2244f72e3..a3a6a7a13 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 @@ -57,9 +57,6 @@ import javax.inject.Inject; * MetadataUpdaterConsumer will create and update the metadata present within the repository. * * @version $Id$ - * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer" - * role-hint="metadata-updater" - * instantiation-strategy="per-lookup" */ @Service("knownRepositoryContentConsumer#metadata-updater") @Scope("prototype") 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 13bb7575d..cea01ef7c 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 @@ -46,9 +46,6 @@ import java.util.List; * ValidateChecksumConsumer - validate the provided checksum against the file it represents. * * @version $Id$ - * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer" - * role-hint="validate-checksum" - * instantiation-strategy="per-lookup" */ @Service( "knownRepositoryContentConsumer#validate-checksum" ) @Scope( "prototype" ) 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 b52fc4eeb..e8bb7697f 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 @@ -51,10 +51,6 @@ import java.util.List; /** * Consumer for removing old snapshots in the repository based on the criteria * specified by the user. - *

- * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer" - * role-hint="repository-purge" - * instantiation-strategy="per-lookup" */ @Service( "knownRepositoryContentConsumer#repository-purge" ) @Scope( "prototype" ) 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 6a774f591..6ab572662 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 @@ -55,8 +55,6 @@ import java.util.List; * Take an artifact off of disk and put it into the metadata repository. * * @version $Id: ArtifactUpdateDatabaseConsumer.java 718864 2008-11-19 06:33:35Z brett $ - * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer" - * role-hint="create-archiva-metadata" instantiation-strategy="per-lookup" */ @Service("knownRepositoryContentConsumer#create-archiva-metadata") @Scope("prototype") 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 46e9821d5..6ca889735 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 @@ -45,7 +45,6 @@ import java.util.List; * DefaultLegacyRepositoryConverter * * @version $Id$ - * plexus.component */ @Service( "legacyRepositoryConverter#default" ) public class DefaultLegacyRepositoryConverter 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 f2bcd9812..a86473ba2 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 @@ -49,10 +49,6 @@ import java.util.List; * into the destination repository. * * @version $Id$ - *

- * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer" - * role-hint="artifact-legacy-to-default-converter" - * instantiation-strategy="per-lookup" */ @Service( "knownRepositoryContentConsumer#artifact-legacy-to-default-converter" ) @Scope( "prototype" ) 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 3eb2797fb..109c78202 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 @@ -36,8 +36,6 @@ import javax.inject.Inject; * {@link PreDownloadPolicy} to check if the requested url has failed before. * * @version $Id$ - * plexus.component role="org.apache.maven.archiva.policies.PreDownloadPolicy" - * role-hint="cache-failures" */ @Service("preDownloadPolicy#cache-failures") public class CachedFailuresPolicy diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ChecksumPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ChecksumPolicy.java index dcbeb5429..4c87387aa 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ChecksumPolicy.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ChecksumPolicy.java @@ -36,9 +36,6 @@ import org.springframework.stereotype.Service; * successfully and completely (or not). * * @version $Id$ - * - * plexus.component role="org.apache.maven.archiva.policies.PostDownloadPolicy" - * role-hint="checksum" */ @Service("postDownloadPolicy#checksum") public class ChecksumPolicy diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsDownloadPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsDownloadPolicy.java index be090edc2..2fd35ee2d 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsDownloadPolicy.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsDownloadPolicy.java @@ -32,9 +32,6 @@ import org.springframework.stereotype.Service; /** * PropagateErrorsPolicy - a policy applied on error to determine how to treat the error. - * - * plexus.component role="org.apache.maven.archiva.policies.DownloadErrorPolicy" - * role-hint="propagate-errors" */ @Service("downloadErrorPolicy#propagate-errors") public class PropagateErrorsDownloadPolicy diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java index 0ea898376..230eb73f4 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java @@ -30,9 +30,6 @@ import org.springframework.stereotype.Service; /** * PropagateErrorsPolicy - a policy applied on error to determine how to treat the error. - * - * plexus.component role="org.apache.maven.archiva.policies.DownloadErrorPolicy" - * role-hint="propagate-errors-on-update" */ @Service("downloadErrorPolicy#propagate-errors-on-update") public class PropagateErrorsOnUpdateDownloadPolicy diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ReleasesPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ReleasesPolicy.java index 357407516..f990ecef6 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ReleasesPolicy.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ReleasesPolicy.java @@ -26,9 +26,6 @@ import org.springframework.stereotype.Service; * {@link PreDownloadPolicy} to apply for released versions. * * @version $Id$ - * - * plexus.component role="org.apache.maven.archiva.policies.PreDownloadPolicy" - * role-hint="releases" */ @Service("preDownloadPolicy#releases") public class ReleasesPolicy diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/SnapshotsPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/SnapshotsPolicy.java index 16b9a8eac..daeb3a50e 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/SnapshotsPolicy.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/SnapshotsPolicy.java @@ -26,9 +26,6 @@ import org.springframework.stereotype.Service; * {@link PreDownloadPolicy} to apply for snapshot versions. * * @version $Id$ - * - * plexus.component role="org.apache.maven.archiva.policies.PreDownloadPolicy" - * role-hint="snapshots" */ @Service("preDownloadPolicy#snapshots") public class SnapshotsPolicy 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 84782aef1..ad667a46d 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 @@ -87,7 +87,6 @@ import java.util.Properties; * @version $Id$ * @todo exception handling needs work - "not modified" is not really an exceptional case, and it has more layers than * your average brown onion - * plexus.component role-hint="default" */ @Service( "repositoryProxyConnectors#default" ) public class DefaultRepositoryProxyConnectors diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java index 9caaaf70e..56549d9e2 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java +++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java @@ -41,9 +41,6 @@ import javax.annotation.PostConstruct; * MockConfiguration * * @version $Id$ - *

- * plexus.component role="org.apache.maven.archiva.configuration.ArchivaConfiguration" - * role-hint="mock" */ @Service( "archivaConfiguration#mock" ) public class MockConfiguration 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 497b66651..22e301c8a 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 @@ -37,9 +37,6 @@ import java.util.concurrent.ConcurrentHashMap; * RepositoryContentRequest * * @version $Id$ - *

- * plexus.component - * role="org.apache.maven.archiva.repository.RepositoryContentFactory" */ @Service( "repositoryContentFactory#default" ) public class RepositoryContentFactory diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java index 3119f6b2a..df0005be6 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java @@ -46,11 +46,6 @@ import java.util.Set; * ManagedDefaultRepositoryContent * * @version $Id$ - * - * plexus.component - * role="org.apache.maven.archiva.repository.ManagedRepositoryContent" - * role-hint="default" - * instantiation-strategy="per-lookup" */ @Service("managedRepositoryContent#default") @Scope("prototype") 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 6bbd61527..d1f00a71b 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 @@ -45,11 +45,6 @@ import java.util.Set; * @version $Id$ * * @todo no need to be a component when filetypes, legacy path parser is not - * - * plexus.component - * role="org.apache.maven.archiva.repository.ManagedRepositoryContent" - * role-hint="legacy" - * instantiation-strategy="per-lookup" */ @Service("managedRepositoryContent#legacy") @Scope("prototype") diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContent.java index 62448eb6a..886b0415a 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContent.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContent.java @@ -31,11 +31,6 @@ import org.springframework.stereotype.Service; * RemoteDefaultRepositoryContent * * @version $Id$ - *

- * plexus.component - * role="org.apache.maven.archiva.repository.RemoteRepositoryContent" - * role-hint="default" - * instantiation-strategy="per-lookup" */ @Service( "remoteRepositoryContent#default" ) @Scope( "prototype" ) diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContent.java index d93d0de4e..f6d946885 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContent.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContent.java @@ -32,9 +32,6 @@ import org.springframework.stereotype.Service; * * @version $Id$ * @todo no need to be a component once legacy path parser is not - * plexus.component role="org.apache.maven.archiva.repository.RemoteRepositoryContent" - * role-hint="legacy" - * instantiation-strategy="per-lookup" */ @Service( "remoteRepositoryContent#legacy" ) @Scope( "prototype" ) 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 48420f259..1b397c674 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 @@ -74,8 +74,6 @@ import java.util.regex.Matcher; * MetadataTools * * @version $Id$ - *

- * plexus.component role="org.apache.maven.archiva.repository.metadata.MetadataTools" */ @Service( "metadataTools#default" ) public class MetadataTools diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/MockConfiguration.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/MockConfiguration.java index 713d5bb13..e460ed30d 100755 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/MockConfiguration.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/MockConfiguration.java @@ -35,9 +35,6 @@ import java.util.Set; * MockConfiguration * * @version $Id$ - * - * plexus.component role="org.apache.maven.archiva.configuration.ArchivaConfiguration" - * role-hint="mock" */ @Service("archivaConfiguration#mock") public class MockConfiguration 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 cec42af4a..1f67853ff 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 @@ -39,7 +39,6 @@ import javax.inject.Inject; * DefaultRepositoryScanner * * @version $Id$ - * plexus.component role="org.apache.archiva.repository.scanner.RepositoryScanner" */ @Service("repositoryScanner#default") public class DefaultRepositoryScanner diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java index 874567d59..c4cc6fc46 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java @@ -31,9 +31,6 @@ import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer; * SampleKnownConsumer * * @version $Id$ - * - * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer" - * role-hint="sample-known" */ public class SampleKnownConsumer extends AbstractMonitoredConsumer 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 ad047ff24..4db22d9e7 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 @@ -57,9 +57,7 @@ import java.util.List; * ArchivaIndexingTaskExecutor Executes all indexing tasks. Adding, updating and removing artifacts from the index are * all performed by this executor. Add and update artifact in index tasks are added in the indexing task queue by the * NexusIndexerConsumer while remove artifact from index tasks are added by the LuceneCleanupRemoveIndexedConsumer. - *

- * plexus.component role="org.codehaus.plexus.taskqueue.execution.TaskExecutor" role-hint="indexing" - * instantiation-strategy="singleton" + * */ @Service( "taskExecutor#indexing" ) public class ArchivaIndexingTaskExecutor 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 46282c21f..4d2c20030 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 @@ -33,7 +33,6 @@ import javax.inject.Named; * Default implementation of a scheduling component for archiva. * * @todo TODO - consider just folding in, not really scheduled - * @plexus.component role="org.apache.archiva.scheduler.ArchivaTaskScheduler" role-hint="indexing" */ @Service("archivaTaskScheduler#indexing") public class IndexingArchivaTaskScheduler 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 481615a00..6eae172fb 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 @@ -51,8 +51,6 @@ import java.util.Date; * ArchivaRepositoryScanningTaskExecutor * * @version $Id$ - * plexus.component role="org.codehaus.plexus.taskqueue.execution.TaskExecutor" - * role-hint="repository-scanning" */ @Service("taskExecutor#repository-scanning") public class ArchivaRepositoryScanningTaskExecutor 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 0fe4bf8cd..634e5edd3 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 @@ -56,8 +56,6 @@ import java.util.Set; /** * Default implementation of a scheduling component for archiva. - *

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

- * plexus.component role="org.apache.archiva.metadata.repository.MetadataResolver" */ @Service( "metadataResolver#default" ) public class DefaultMetadataResolver diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java index f45db77f5..a1589c070 100644 --- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java +++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java @@ -24,7 +24,7 @@ import org.apache.archiva.metadata.model.MetadataFacetFactory; import org.springframework.stereotype.Service; /** - * plexus.component role="org.apache.archiva.metadata.model.MetadataFacetFactory" role-hint="org.apache.archiva.audit" + * */ @Service("metadataFacetFactory#org.apache.archiva.audit") public class AuditEventFactory diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditLog.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditLog.java index 00d779c78..18c7f2867 100644 --- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditLog.java +++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditLog.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Service; * AuditLog - Audit Log. * * @version $Id$ - * @plexus.component role="org.apache.archiva.audit.AuditListener" role-hint="logging" + * */ @Service("auditListener#logging") public class AuditLog diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java index d199b725d..ad3cfdf0b 100644 --- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java +++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java @@ -36,7 +36,7 @@ import java.util.List; import java.util.TimeZone; /** - * @plexus.component role="org.apache.archiva.audit.AuditManager" + * */ @Service("auditManager#default") public class DefaultAuditManager 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 181a58ba9..205faec40 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 @@ -29,7 +29,7 @@ import org.springframework.stereotype.Service; import javax.inject.Inject; /** - * plexus.component role="org.apache.archiva.audit.AuditListener" role-hint="metadata" + * */ @Service("uuditListener#metadata") public class MetadataAuditListener diff --git a/archiva-modules/plugins/generic-metadata-support/pom.xml b/archiva-modules/plugins/generic-metadata-support/pom.xml index 09c481957..b0cc9df71 100644 --- a/archiva-modules/plugins/generic-metadata-support/pom.xml +++ b/archiva-modules/plugins/generic-metadata-support/pom.xml @@ -27,16 +27,18 @@ generic-metadata-support Archiva Core Plugins :: Generic Metadata Support - http://maven.apache.org org.apache.archiva metadata-model + + org.springframework + spring-context + junit junit - 3.8.1 test diff --git a/archiva-modules/plugins/generic-metadata-support/src/main/java/org/apache/archiva/metadata/generic/GenericMetadataFacetFactory.java b/archiva-modules/plugins/generic-metadata-support/src/main/java/org/apache/archiva/metadata/generic/GenericMetadataFacetFactory.java index 63a52bcca..c2f2aa70c 100644 --- a/archiva-modules/plugins/generic-metadata-support/src/main/java/org/apache/archiva/metadata/generic/GenericMetadataFacetFactory.java +++ b/archiva-modules/plugins/generic-metadata-support/src/main/java/org/apache/archiva/metadata/generic/GenericMetadataFacetFactory.java @@ -21,11 +21,11 @@ package org.apache.archiva.metadata.generic; import org.apache.archiva.metadata.model.MetadataFacet; import org.apache.archiva.metadata.model.MetadataFacetFactory; +import org.springframework.stereotype.Service; /** - * @plexus.component role="org.apache.archiva.metadata.model.MetadataFacetFactory" - * role-hint="org.apache.archiva.metadata.generic" */ +@Service("metadataFacetFactory#org.apache.archiva.metadata.generic") public class GenericMetadataFacetFactory implements MetadataFacetFactory { 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 5dea113e5..6728bc93b 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 @@ -94,8 +94,6 @@ import javax.inject.Named; * Default implementation of DependencyTreeBuilder. Customized wrapper for maven-dependency-tree to use * maven-model-builder instead of maven-project. Note that the role must differ to avoid conflicting with the * maven-shared implementation. - *

- * plexus.component role="org.apache.archiva.dependency.tree.maven2.DependencyTreeBuilder" role-hint="maven2" */ @Service( "dependencyTreeBuilder#maven2" ) public class DefaultDependencyTreeBuilder diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DefaultArtifactMappingProvider.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DefaultArtifactMappingProvider.java index bc08d8a96..6be451e1f 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DefaultArtifactMappingProvider.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DefaultArtifactMappingProvider.java @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.Map; /** - * plexus.component role="org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider" role-hint="default" + * */ @Service( "artifactMappingProvider#default" ) public class DefaultArtifactMappingProvider diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java index 15b0d01f3..e46b6ebfa 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java @@ -27,7 +27,7 @@ import org.apache.maven.model.plugin.LifecycleBindingsInjector; /** * Required as plexus-spring doesn't understand the optional = true argument added to Plexus and used here. * - * @plexus.component role="org.apache.maven.model.plugin.LifecycleBindingsInjector" + * */ public class DummyLifecycleBindingsInjector implements LifecycleBindingsInjector diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java index c1bb5cc2b..e66f66504 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java @@ -34,7 +34,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; /** - * plexus.component role="org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator" role-hint="maven2" + * */ @Service( "repositoryPathTranslator#maven2" ) public class Maven2RepositoryPathTranslator @@ -46,11 +46,8 @@ public class Maven2RepositoryPathTranslator private static final Pattern TIMESTAMP_PATTERN = Pattern.compile( "([0-9]{8}.[0-9]{6})-([0-9]+).*" ); - //@Inject - //private ApplicationContext applicationContext; - /** - * plexus.requirement role="org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider" + * * see #initialize */ @Inject 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 4ac92227f..7b3a0952b 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 @@ -82,7 +82,6 @@ import javax.inject.Named; * The session is passed in as an argument to obtain any necessary resources, rather than the class being instantiated * within the session in the context of a single managed repository's resolution needs. *

- * plexus.component role="org.apache.archiva.metadata.repository.storage.RepositoryStorage" role-hint="maven2" */ @Service( "repositoryStorage#maven2" ) public class Maven2RepositoryStorage diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java index 89ceaeb7a..215cb91d9 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java @@ -24,7 +24,7 @@ import org.apache.archiva.metadata.model.MetadataFacetFactory; import org.springframework.stereotype.Service; /** - * plexus.component role="org.apache.archiva.metadata.model.MetadataFacetFactory" role-hint="org.apache.archiva.metadata.repository.storage.maven2.artifact" + * */ @Service("metadataFacetFactory#org.apache.archiva.metadata.repository.storage.maven2.artifact") public class MavenArtifactFacetFactory diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java index 84e145300..999f805ff 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java @@ -24,7 +24,7 @@ import org.apache.archiva.metadata.model.MetadataFacetFactory; import org.springframework.stereotype.Service; /** - * plexus.component role="org.apache.archiva.metadata.model.MetadataFacetFactory" role-hint="org.apache.archiva.metadata.repository.storage.maven2.project" + * */ @Service( "metadataFacetFactory#org.apache.archiva.metadata.repository.storage.maven2.project" ) public class MavenProjectFacetFactory 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 3b2f02750..a43c38f87 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 @@ -36,7 +36,7 @@ import java.util.HashMap; import java.util.Map; /** - * plexus.component role="org.apache.archiva.metadata.repository.RepositorySessionFactory" role-hint="file" + * */ @Service( "repositorySessionFactory#file" ) public class FileRepositorySessionFactory 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 cf12d0af6..9c2b69aa5 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 @@ -36,7 +36,7 @@ import java.util.HashMap; import java.util.Map; /** - * plexus.component role="org.apache.archiva.metadata.repository.RepositorySessionFactory" role-hint="jcr" + * */ @Service( "repositorySessionFactory#jcr" ) public class JcrRepositorySessionFactory diff --git a/archiva-modules/plugins/npanday-support/pom.xml b/archiva-modules/plugins/npanday-support/pom.xml index 9b1108485..779286197 100644 --- a/archiva-modules/plugins/npanday-support/pom.xml +++ b/archiva-modules/plugins/npanday-support/pom.xml @@ -33,5 +33,9 @@ org.apache.archiva maven2-repository + + org.springframework + spring-context + diff --git a/archiva-modules/plugins/npanday-support/src/main/java/org/apache/archiva/plugins/npanday/NPandayArtifactMappingProvider.java b/archiva-modules/plugins/npanday-support/src/main/java/org/apache/archiva/plugins/npanday/NPandayArtifactMappingProvider.java index 800ec7c59..fa6ad0cb5 100644 --- a/archiva-modules/plugins/npanday-support/src/main/java/org/apache/archiva/plugins/npanday/NPandayArtifactMappingProvider.java +++ b/archiva-modules/plugins/npanday-support/src/main/java/org/apache/archiva/plugins/npanday/NPandayArtifactMappingProvider.java @@ -20,13 +20,14 @@ package org.apache.archiva.plugins.npanday; */ import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider; +import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.Map; /** - * @plexus.component role="org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider" role-hint="npanday" */ +@Service( "artifactMappingProvider#npanday" ) public class NPandayArtifactMappingProvider implements ArtifactMappingProvider { diff --git a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java index 84127521a..825b2573d 100644 --- a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java +++ b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java @@ -31,8 +31,7 @@ import org.springframework.stereotype.Service; /** * Process repository management events and respond appropriately. - *

- * plexus.component role="org.apache.archiva.repository.events.RepositoryListener" role-hint="problem-reports" + * */ @Service( "repositoryListener#problem-reports" ) public class RepositoryProblemEventListener diff --git a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java index e39077c1e..7531fa403 100644 --- a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java +++ b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java @@ -24,7 +24,7 @@ import org.apache.archiva.metadata.model.MetadataFacetFactory; import org.springframework.stereotype.Service; /** - * plexus.component role="org.apache.archiva.metadata.model.MetadataFacetFactory" role-hint="org.apache.archiva.reports" + * */ @Service( "metadataFacetFactory#org.apache.archiva.reports" ) public class RepositoryProblemFacetFactory 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 592457d43..fa221d022 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 @@ -59,9 +59,6 @@ import java.util.List; * TODO: no need for this to be a scanner - we can just query the database / content repository to get a full list * * @version $Id$ - * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer" - * role-hint="duplicate-artifacts" - * instantiation-strategy="per-lookup" */ @Service( "knownRepositoryContentConsumer#duplicate-artifacts" ) @Scope( "prototype" ) diff --git a/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java b/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java index dbaf6b341..fb1d8218c 100644 --- a/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java +++ b/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java @@ -48,7 +48,7 @@ import javax.jcr.query.QueryResult; import javax.jcr.query.Row; /** - * plexus.component role="org.apache.archiva.metadata.repository.stats.RepositoryStatisticsManager" role-hint="default" + * */ @Service("repositoryStatisticsManager#default") public class DefaultRepositoryStatisticsManager diff --git a/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java b/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java index cb419640f..18bf920cb 100644 --- a/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java +++ b/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java @@ -24,7 +24,7 @@ import org.apache.archiva.metadata.model.MetadataFacetFactory; import org.springframework.stereotype.Service; /** - * plexus.component role="org.apache.archiva.metadata.model.MetadataFacetFactory" role-hint="org.apache.archiva.metadata.repository.stats" + * */ @Service( "metadataFacetFactory#org.apache.archiva.metadata.repository.stats" ) public class RepositoryStatisticsFactory 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 1d8da4b75..7a97691c0 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 @@ -53,7 +53,7 @@ import javax.inject.Inject; import javax.inject.Named; /** - * plexus.component role="org.apache.archiva.stagerepository.merge.RepositoryMerger" role-hint="maven2" + * */ @Service( "repositoryMerger#maven2" ) public class Maven2RepositoryMerger -- 2.39.5