]> source.dussan.org Git - archiva.git/commitdiff
get RID of plexus.component annotation
authorOlivier Lamy <olamy@apache.org>
Tue, 6 Sep 2011 07:26:05 +0000 (07:26 +0000)
committerOlivier Lamy <olamy@apache.org>
Tue, 6 Sep 2011 07:26:05 +0000 (07:26 +0000)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1165527 13f79535-47bb-0310-9956-ffa450edef68

66 files changed:
archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArtifactCountConsumer.java
archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java
archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ChecksumPolicy.java
archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsDownloadPolicy.java
archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java
archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ReleasesPolicy.java
archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/SnapshotsPolicy.java
archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryContentFactory.java
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContent.java
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContent.java
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java
archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/MockConfiguration.java
archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java
archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java
archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java
archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java
archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java
archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaServletAuthenticator.java
archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/MimeTypes.java
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/BypassSecuritySystem.java
archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java
archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditLog.java
archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java
archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java
archiva-modules/plugins/generic-metadata-support/pom.xml
archiva-modules/plugins/generic-metadata-support/src/main/java/org/apache/archiva/metadata/generic/GenericMetadataFacetFactory.java
archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DefaultArtifactMappingProvider.java
archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java
archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java
archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java
archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java
archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
archiva-modules/plugins/npanday-support/pom.xml
archiva-modules/plugins/npanday-support/src/main/java/org/apache/archiva/plugins/npanday/NPandayArtifactMappingProvider.java
archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java
archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java
archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java
archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java
archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java

index dc4ef781486f7e382d07d678d38eda6d3a8449f1..8c7c4ed89b8f836e4a2dfcf2971afd07bed35f3e 100644 (file)
@@ -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")
index 712f8a6f242b01a425e5dc19c17c18c4cca63f7a..15822048360fe16ec3398046e70ccaaea1f31d21 100644 (file)
@@ -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
index e0a5b875afc07a636ed8ad050954147a161def4a..6cfe80c66983b546a0df37901a501781e954dc23 100644 (file)
@@ -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.
  * </p>
- * <p/>
- * plexus.component role="org.apache.maven.archiva.configuration.ArchivaConfiguration"
  */
 @Service( "archivaConfiguration#default" )
 public class DefaultArchivaConfiguration
index cf1c57720e9d9698b4e072278a7d85e1450efd44..c15239a5db98a666353cebad5611cda21c814877 100644 (file)
@@ -46,8 +46,6 @@ import java.util.Map;
  * FileTypes
  *
  * @version $Id$
- *          <p/>
- *          plexus.component role="org.apache.maven.archiva.configuration.FileTypes"
  */
 @Service( "fileTypes" )
 public class FileTypes
index 325581c9cf433731ea3976461aa772820f266db0..8c3dab8152ec30f1f970b8ed698a720584ef6d56 100644 (file)
@@ -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")
index 9ec80bce607c5786eb0cb3fffe994c9a53911bed..09dd5ca333ea91c4b6d00e785ec154c5ebcf482e 100644 (file)
@@ -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")
index 2244f72e333cd94eae875eba370923bea3a237ad..a3a6a7a13337de02d3fcb6505ee81be2a73c5d6a 100644 (file)
@@ -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")
index 13bb7575d1ac1473d98ef712d5f3bb9c2ef6227f..cea01ef7c7fcac287432809b14791723c12d93b0 100644 (file)
@@ -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" )
index b52fc4eeb0c488d286e12a6f5b25bb9e8ab978b1..e8bb7697f9d7737800c19f84d7195da3b8426e4d 100644 (file)
@@ -51,10 +51,6 @@ import java.util.List;
 /**
  * Consumer for removing old snapshots in the repository based on the criteria
  * specified by the user.
- * <p/>
- * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
- * role-hint="repository-purge"
- * instantiation-strategy="per-lookup"
  */
 @Service( "knownRepositoryContentConsumer#repository-purge" )
 @Scope( "prototype" )
index 6a774f591d5933d27328510274520ced1744c7f8..6ab5726623f95f673faa334abe47976e2c2f6878 100644 (file)
@@ -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")
index f2bcd9812803d1b202473f88a27b1e11ae31f87f..a86473ba29a6bbd1fba8469398eabc694f714256 100644 (file)
@@ -49,10 +49,6 @@ import java.util.List;
  * into the destination repository.
  *
  * @version $Id$
- *          <p/>
- *          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" )
index 3eb2797fb342ed9ca817ccad1fd07e3edfff0e47..109c78202574c45671ce59526b0fba0f02013eca 100644 (file)
@@ -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
index dcbeb542901515f5f1c50f7dc04e8ac3f23ac288..4c87387aa98fcb6fe50660dd4cf8e35e1aa7bd42 100644 (file)
@@ -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
index be090edc21848fccb44a443f69943360a54c5247..2fd35ee2d68e12a09f7f9a0c2fb133dd094f4b59 100644 (file)
@@ -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
index 0ea8983765715ae4cca87a1518d61203b34f7a3a..230eb73f41e7c1e61c21ea738c1043cd6d2e585b 100644 (file)
@@ -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
index 35740751634631fec9cbfedbe6fc53af83be7351..f990ecef615a75e4df52b0ebf08500e425a7bbc6 100644 (file)
@@ -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
index 16b9a8eac8e00b350f76cc64065494bc76d7dd1f..daeb3a50e983e241c67ab6b91a9775c6b51f048e 100644 (file)
@@ -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
index 84782aef1383cfa3178627b6efeb8ddb3f8c1ea8..ad667a46dc607e6d1d80c068bd6d5bf55e386d59 100644 (file)
@@ -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
index 9caaaf70e0e4fef3d54c33498c70865f6d2809f0..56549d9e2725f6e1e9e491a0e9ba277cfa3d5fa8 100644 (file)
@@ -41,9 +41,6 @@ import javax.annotation.PostConstruct;
  * MockConfiguration
  *
  * @version $Id$
- *          <p/>
- *          plexus.component role="org.apache.maven.archiva.configuration.ArchivaConfiguration"
- *          role-hint="mock"
  */
 @Service( "archivaConfiguration#mock" )
 public class MockConfiguration
index 497b66651b0be6cdd0eeddcfe84118e2d79b91ce..22e301c8aa4cd553839af1051d41a3dad6c812f6 100644 (file)
@@ -37,9 +37,6 @@ import java.util.concurrent.ConcurrentHashMap;
  * RepositoryContentRequest
  *
  * @version $Id$
- *          <p/>
- *          plexus.component
- *          role="org.apache.maven.archiva.repository.RepositoryContentFactory"
  */
 @Service( "repositoryContentFactory#default" )
 public class RepositoryContentFactory
index 3119f6b2aeec82972f31523859bd4dca792ef627..df0005be698b7dcf077c1280cd171c978d29aed6 100644 (file)
@@ -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")
index 6bbd615270a09deddfe88a5e368de0f13754040c..d1f00a71bfa61b15633f94c733f1e817111f5e47 100644 (file)
@@ -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")
index 62448eb6a276aaf46b8a9f48c2fa7bda356dad3a..886b0415afb1b6de70ec2cd4a3cff7731edb75eb 100644 (file)
@@ -31,11 +31,6 @@ import org.springframework.stereotype.Service;
  * RemoteDefaultRepositoryContent
  *
  * @version $Id$
- *          <p/>
- *          plexus.component
- *          role="org.apache.maven.archiva.repository.RemoteRepositoryContent"
- *          role-hint="default"
- *          instantiation-strategy="per-lookup"
  */
 @Service( "remoteRepositoryContent#default" )
 @Scope( "prototype" )
index d93d0de4e66c3ea6950ebf7e9484e790265bb107..f6d946885d3f93c767dc1afd8c51efee4458c227 100644 (file)
@@ -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" )
index 48420f259bfec8dd17943ef0da7d06292c1c3eac..1b397c674f160a757d13f6de4093c8b9680baf08 100644 (file)
@@ -74,8 +74,6 @@ import java.util.regex.Matcher;
  * MetadataTools
  *
  * @version $Id$
- *          <p/>
- *          plexus.component role="org.apache.maven.archiva.repository.metadata.MetadataTools"
  */
 @Service( "metadataTools#default" )
 public class MetadataTools
index 713d5bb13b380d292597561d1a9fd3e7f56fe72b..e460ed30dc6158aec757437a37b9d7958d062b22 100755 (executable)
@@ -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
index cec42af4ad9f98affba4b147819ec7e24272417a..1f67853ffa2aa70af9e4cdc76e8367e24bb009d2 100644 (file)
@@ -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
index 874567d59c1865986c9bc3965052c9e4f5bcc814..c4cc6fc464cdb2b3e11ec5783db5fe45e8489837 100644 (file)
@@ -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
index ad047ff24be4e625fba6485b44952ebbc235448e..4db22d9e7b4fed028b8f1a5df8f79df752a91928 100644 (file)
@@ -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.
- * <p/>
- * plexus.component role="org.codehaus.plexus.taskqueue.execution.TaskExecutor" role-hint="indexing"
- * instantiation-strategy="singleton"
+ *
  */
 @Service( "taskExecutor#indexing" )
 public class ArchivaIndexingTaskExecutor
index 46282c21fb61c59e01eb5e83b996839f596efbc7..4d2c20030e70f1a415de05cea161e582af34a861 100644 (file)
@@ -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
index 481615a0003fe5b3d94b61c97f1ec47f15db396a..6eae172fb5fa38ab0854cdd0f8f2b1b29dc3a329 100644 (file)
@@ -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
index 0fe4bf8cdfe8850e058132dd732fb0abf2778d5d..634e5edd3213f65c79a287a781bce21e91fab27b 100644 (file)
@@ -56,8 +56,6 @@ import java.util.Set;
 
 /**
  * Default implementation of a scheduling component for archiva.
- * <p/>
- * plexus.component role="org.apache.archiva.scheduler.ArchivaTaskScheduler" role-hint="repository"
  */
 @Service( "archivaTaskScheduler#repository" )
 public class RepositoryArchivaTaskScheduler
index af2433968d480ba223caf3f4189025cc6d5aa5f5..e51ec85dcab8b1a8f220766da43ab8c61143526f 100644 (file)
@@ -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")
index 0f2b7d5937b3a090ee4ca757063fe50898dcda5e..a49f236ee48309bf755114224acb31b86aec61e8 100644 (file)
@@ -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
index 4757c2855280e727298d9114aa1ce2e3ca0eaa74..285edcbdcf7abc1992fc4c205bf63399749ad899 100644 (file)
@@ -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
index 8d00acb7e1ccb228db69430ef0aa2c8fe69ed909..dd384635bf8426cfaf3880841baef26f4ec44ded 100644 (file)
@@ -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
index 15b3e91208814daeba2626fdc9500c4047fb4b10..4413df0569c993a9e927cb1445a5dbd9270b9430 100644 (file)
@@ -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
index 983670f84c4b6ba9df8d130532eae9fbae68c15d..698a3752052b76b1adadeb8e611356f2943d0dfd 100644 (file)
@@ -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
index 5d97924f117868b9318da5734c5aa0f43d8944c2..d6d3244809e4470739064b0c70deeeba92830432 100644 (file)
@@ -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
index 99132a744110c44e083583e5f8de5478846f20a2..a9372a96e68a7ae834eb4a8173abeb50d04af7e2 100644 (file)
@@ -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
index 733679f879088c9699b44da44c51a70362811643..ec0827b1dc80388c71a29dea57b3aea7cb9339d1 100644 (file)
@@ -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
index e6fb6888e40b7cd859a7dc97c23e7ac14bd83168..f9d70a3d7ef43dbe075e847ea00d2c8b88f08641 100644 (file)
@@ -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.
  * <p/>
- * plexus.component role="org.apache.archiva.metadata.repository.MetadataResolver"
  */
 @Service( "metadataResolver#default" )
 public class DefaultMetadataResolver
index f45db77f5ffc7a4c0e5301e3a09117644eeb14c0..a1589c0708cdc3efaef22789a62b8fc15b44675f 100644 (file)
@@ -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
index 00d779c789c2bc04abcd47007316e94d3569e537..18c7f286767b88c52c89b72579c5d2a543126aff 100644 (file)
@@ -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
index d199b725db254aabfc69400b2d9da4b79685fb67..ad3cfdf0bccb401f701cb4b98140a5eba2d6acbb 100644 (file)
@@ -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
index 181a58ba9fbf368d58a2614f557a3800bb9be531..205faec4036102a1a1a33411fde53d04fcd73276 100644 (file)
@@ -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
index 09c481957d5c775fa4dfe82c260012297e55acee..b0cc9df7154b05fad727ab26e5992a40688288e4 100644 (file)
   </parent>
   <artifactId>generic-metadata-support</artifactId>
   <name>Archiva Core Plugins :: Generic Metadata Support</name>
-  <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>metadata-model</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
index 63a52bcca3c14b99debdf8fdb009d7015d8ecb2a..c2f2aa70c1b9eaf0bc3b9e0a46d5a2a3bf4619d3 100644 (file)
@@ -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
 {
index 5dea113e500c6ca1615b396d7577f4d717524854..6728bc93b03e4d6aff92de0751f5fd535490e097 100644 (file)
@@ -94,8 +94,6 @@ import javax.inject.Named;
  * Default implementation of <code>DependencyTreeBuilder</code>. 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.
- * <p/>
- * plexus.component role="org.apache.archiva.dependency.tree.maven2.DependencyTreeBuilder" role-hint="maven2"
  */
 @Service( "dependencyTreeBuilder#maven2" )
 public class DefaultDependencyTreeBuilder
index bc08d8a96fe02c9b645175291b6194653e85f228..6be451e1ffae97c9cfb645f43f57198908f04a42 100644 (file)
@@ -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
index 15b0d01f3384e25c51ceace88f288c9e5abb4098..e46b6ebfa09702beb250f3f3971c6835de6785a4 100644 (file)
@@ -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
index c1bb5cc2bac18ff59514e7da527bd6024063a5c7..e66f66504c6384cc1318c6c3dd3e15fdad96aae9 100644 (file)
@@ -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
index 4ac92227f0e6d7e4b737cd3e507b352cdf224a16..7b3a0952b2db506cba498dbd2a40dc1b08a330a1 100644 (file)
@@ -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.
  * <p/>
- * plexus.component role="org.apache.archiva.metadata.repository.storage.RepositoryStorage" role-hint="maven2"
  */
 @Service( "repositoryStorage#maven2" )
 public class Maven2RepositoryStorage
index 89ceaeb7ace09cecd935ae0f81e9d6063fcdd63e..215cb91d900f2e180caa6b4c00c503d51f237586 100644 (file)
@@ -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
index 84e14530092b02cff0402fd2c59105f38b061ac1..999f805ffc20672d39e3a7a5da8246a9c23cd3a3 100644 (file)
@@ -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
index 3b2f027502165bb10a078351337f91861578469b..a43c38f879fd72e4bd2520fbbea40fc1464aa58d 100644 (file)
@@ -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
index cf12d0af692e404a4424538031e31cd3df42e356..9c2b69aa5bd808af4b825008e86a75c659099650 100644 (file)
@@ -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
index 9b110848538eea071421010afc376672aee48e7c..77928619721a930f0f4bc1f2cd3faaddb25e1ee0 100644 (file)
@@ -33,5 +33,9 @@
       <groupId>org.apache.archiva</groupId>
       <artifactId>maven2-repository</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+    </dependency>
   </dependencies>
 </project>
index 800ec7c597648781d9aca95e4ebd95c0b00a2425..fa6ad0cb50e1dad3de1b9232b455a630fcb7f028 100644 (file)
@@ -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
 {
index 84127521a56ecf06c86186528710096837af773c..825b2573db1ac62923377c9df226c5f8d09357e7 100644 (file)
@@ -31,8 +31,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * Process repository management events and respond appropriately.
- * <p/>
- * plexus.component role="org.apache.archiva.repository.events.RepositoryListener" role-hint="problem-reports"
+ *
  */
 @Service( "repositoryListener#problem-reports" )
 public class RepositoryProblemEventListener
index e39077c1e3aca2f23430fc8e8fc8482182f53968..7531fa40349559eaab8b007b515aa345bdcfea80 100644 (file)
@@ -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
index 592457d4300b9605f3daf6b54c84a61492d78164..fa221d0228556bc6b286bf5a1daa135bb21f3b16 100644 (file)
@@ -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" )
index dbaf6b341ca2eb18a9de65045ee5f3101d557572..fb1d8218c3109f4b09a1a71162af11c728988f34 100644 (file)
@@ -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
index cb419640f31ac8d2bbcbb9ec9fd73611015ad9dc..18bf920cbeb47a1185ff076b02859e45604d8b29 100644 (file)
@@ -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
index 1d8da4b7562ed69c86523360745f5bbf1238d905..7a97691c065c19a4517528bcd86225c0bdf67028 100644 (file)
@@ -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