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

36 files changed:
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/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-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.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/AbstractDefaultRepositoryContent.java
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.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/metadata/MetadataTools.java
archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.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/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/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/MetadataAuditListener.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/Maven2RepositoryStorage.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/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java

index 15822048360fe16ec3398046e70ccaaea1f31d21..268667b49c9cdbc5a30f99f79e04b06daa1628cf 100644 (file)
@@ -75,7 +75,7 @@ public class LegacyToDefaultConverter
 {
     /**
      * {@link List}&lt;{@link Digester}
-     * plexus.requirement role="org.codehaus.plexus.digest.Digester"
+     *
      */
     private List<? extends Digester> digesters;
 
@@ -86,17 +86,17 @@ public class LegacyToDefaultConverter
     private DigesterUtils digesterUtils;
 
     /**
-     * plexus.requirement
+     *
      */
     private ModelConverter translator;
 
     /**
-     * plexus.requirement
+     *
      */
     private ArtifactFactory artifactFactory;
 
     /**
-     * plexus.requirement
+     *
      */
     private ArtifactHandlerManager artifactHandlerManager;
 
index 6cfe80c66983b546a0df37901a501781e954dc23..34f72d8088afe0029386957b1f4a5120b82c4ba9 100644 (file)
@@ -94,8 +94,7 @@ public class DefaultArchivaConfiguration
 
     /**
      * Plexus registry to read the configuration from.
-     * <p/>
-     * plexus.requirement role-hint="commons-configuration"
+     *
      */
     @Inject
     @Named( value = "commons-configuration" )
@@ -111,7 +110,6 @@ public class DefaultArchivaConfiguration
 
     /**
      * see #initialize
-     * plexus.requirement role="org.apache.maven.archiva.policies.PreDownloadPolicy"
      *
      * @todo these don't strictly belong in here
      */
@@ -119,7 +117,6 @@ public class DefaultArchivaConfiguration
 
     /**
      * see #initialize
-     * plexus.requirement role="org.apache.maven.archiva.policies.PostDownloadPolicy"
      *
      * @todo these don't strictly belong in here
      */
index c15239a5db98a666353cebad5611cda21c814877..80d04af87821e73eb8cb0233771b5641f656eb32 100644 (file)
@@ -60,7 +60,7 @@ public class FileTypes
     public static final String IGNORED = "ignored";
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named( value = "archivaConfiguration#default" )
index 8c3dab8152ec30f1f970b8ed698a720584ef6d56..751998a348be0bdadfb763ce6999ee9b6ccaa8b0 100644 (file)
@@ -62,13 +62,13 @@ public class AutoRemoveConsumer
     private String description = "Automatically Remove File from Filesystem.";
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private ArchivaConfiguration configuration;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private FileTypes filetypes;
index a3a6a7a13337de02d3fcb6505ee81be2a73c5d6a..2189a0bfa60bf74c903e2122c77c197bceb44749 100644 (file)
@@ -77,25 +77,25 @@ public class MetadataUpdaterConsumer
     private String description = "Update / Create maven-metadata.xml files";
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private RepositoryContentFactory repositoryFactory;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private MetadataTools metadataTools;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private ArchivaConfiguration configuration;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private FileTypes filetypes;
index cea01ef7c7fcac287432809b14791723c12d93b0..b0adf3aa562960097a727af2df03e6052a351692 100644 (file)
@@ -72,12 +72,12 @@ public class ValidateChecksumConsumer
     private String description = "Validate checksums against file.";
 
     /**
-     * plexus.requirement
+     *
      */
     private ChecksumFile checksum;
 
     /**
-     * plexus.requirement role="org.codehaus.plexus.digest.Digester"
+     *
      */
     private List<Digester> allDigesters;
 
index e8bb7697f9d7737800c19f84d7195da3b8426e4d..a690d1566eae9cdaaf3164ecb7823730075d2327 100644 (file)
@@ -69,27 +69,27 @@ public class RepositoryPurgeConsumer
     private String description = "Purge repository of old snapshots";
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named( value = "archivaConfiguration#default" )
     private ArchivaConfiguration configuration;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named(value = "repositoryContentFactory#default")
     private RepositoryContentFactory repositoryContentFactory;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private MetadataTools metadataTools;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named(value = "fileTypes")
@@ -103,19 +103,15 @@ public class RepositoryPurgeConsumer
 
     private boolean deleteReleasedSnapshots;
 
-    //@Inject
-    //private ApplicationContext applicationContext;
-
     /**
-     * plexus.requirement role="org.apache.archiva.repository.events.RepositoryListener"
+     *
      */
     @Inject
     private List<RepositoryListener> listeners = Collections.emptyList();
 
     /**
      * TODO: this could be multiple implementations and needs to be configured.
-     * <p/>
-     * plexus.requirement
+     *
      */
     @Inject
     private RepositorySessionFactory repositorySessionFactory;
index 6ab5726623f95f673faa334abe47976e2c2f6878..f526cb2a9df96345bc1a88315830587e960f1db4 100644 (file)
@@ -73,13 +73,11 @@ public class ArchivaMetadataCreationConsumer
     private String description = "Create basic metadata for Archiva to be able to reference the artifact";
 
     /**
-     * plexus.requirement
      */
     @Inject
     private ArchivaConfiguration configuration;
 
     /**
-     * plexus.requirement
      */
     @Inject
     private FileTypes filetypes;
@@ -91,7 +89,6 @@ public class ArchivaMetadataCreationConsumer
     /**
      * FIXME: can be of other types
      *
-     * @plexus.requirement
      */
     @Inject
     private RepositorySessionFactory repositorySessionFactory;
@@ -100,7 +97,6 @@ public class ArchivaMetadataCreationConsumer
      * FIXME: this needs to be configurable based on storage type - and could also be instantiated per repo. Change to a
      * factory.
      *
-     * plexus.requirement role-hint="maven2"
      */
     @Inject
     @Named(value = "repositoryStorage#maven2")
index 6ca889735b0939a114691822d3116902b902c033..02950448b634b71a5764e5cad7c67f8a11296742 100644 (file)
@@ -51,25 +51,24 @@ public class DefaultLegacyRepositoryConverter
     implements LegacyRepositoryConverter
 {
     /**
-     * plexus.requirement
+     *
      */
     private ArtifactRepositoryFactory artifactRepositoryFactory;
 
     /**
-     * plexus.requirement role-hint="default"
+     *
      */
     private ArtifactRepositoryLayout defaultLayout;
 
     /**
-     * plexus.requirement role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
-     * role-hint="artifact-legacy-to-default-converter"
+     *
      */
     @Inject
     @Named( value = "knownRepositoryContentConsumer#artifact-legacy-to-default-converter" )
     private LegacyConverterArtifactConsumer legacyConverterConsumer;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private RepositoryScanner repoScanner;
index a86473ba29a6bbd1fba8469398eabc694f714256..92a7d0cc6626e4467f86ce6735ae84775a52a65f 100644 (file)
@@ -59,13 +59,13 @@ public class LegacyConverterArtifactConsumer
     private Logger log = LoggerFactory.getLogger( LegacyConverterArtifactConsumer.class );
 
     /**
-     * plexus.requirement role-hint="legacy-to-default"
+     *
      */
     @Inject
     private ArtifactConverter artifactConverter;
 
     /**
-     * plexus.requirement
+     *
      */
     private ArtifactFactory artifactFactory;
 
index 109c78202574c45671ce59526b0fba0f02013eca..45385b3532e8db2f69b20e94f3c8b5135a5b3ff8 100644 (file)
@@ -56,7 +56,7 @@ public class CachedFailuresPolicy
     public static final String YES = "yes";
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private UrlFailureCache urlFailureCache;
index ad667a46dc607e6d1d80c068bd6d5bf55e386d59..4d400b8d641cf6ded88a7e63208e77468c78c570 100644 (file)
@@ -95,49 +95,46 @@ public class DefaultRepositoryProxyConnectors
     private Logger log = LoggerFactory.getLogger( DefaultRepositoryProxyConnectors.class );
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named( value = "archivaConfiguration#default" )
     private ArchivaConfiguration archivaConfiguration;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named( value = "repositoryContentFactory#default" )
     private RepositoryContentFactory repositoryFactory;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named( value = "metadataTools#default" )
     private MetadataTools metadataTools;
 
-    //@Inject
-    //private ApplicationContext applicationContext;
-
     /**
-     * plexus.requirement role="org.apache.maven.archiva.policies.PreDownloadPolicy"
+     *
      */
     @Inject
     private Map<String, PreDownloadPolicy> preDownloadPolicies;
 
     /**
-     * plexus.requirement role="org.apache.maven.archiva.policies.PostDownloadPolicy"
+     *
      */
     @Inject
     private Map<String, PostDownloadPolicy> postDownloadPolicies;
 
     /**
-     * plexus.requirement role="org.apache.maven.archiva.policies.DownloadErrorPolicy"
+     *
      */
     @Inject
     private Map<String, DownloadErrorPolicy> downloadErrorPolicies;
 
     /**
-     * plexus.requirement role-hint="default"
+     *
      */
     @Inject
     private UrlFailureCache urlFailureCache;
@@ -147,13 +144,13 @@ public class DefaultRepositoryProxyConnectors
     private Map<String, ProxyInfo> networkProxyMap = new HashMap<String, ProxyInfo>();
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private WagonFactory wagonFactory;
 
     /**
-     * plexus.requirement role="org.apache.archiva.scheduler.ArchivaTaskScheduler" role-hint="repository"
+     *
      */
     @Inject
     @Named( value = "archivaTaskScheduler#repository" )
index 22e301c8aa4cd553839af1051d41a3dad6c812f6..af79060b679c46190cad7b41c39a43e9a6d0db56 100644 (file)
@@ -43,7 +43,7 @@ public class RepositoryContentFactory
     implements RegistryListener
 {
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private ArchivaConfiguration archivaConfiguration;
index 062dd7d13057b0772292d7905caba73a14fcb83a..a691b13e40e8ec8dd2dba0f0e599780dd9bbed1b 100644 (file)
@@ -60,19 +60,15 @@ public abstract class AbstractDefaultRepositoryContent
     private PathParser defaultPathParser = new DefaultPathParser();
 
     /**
-     * plexus.requirement role="org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider"
+     *
      */
     @Inject
     protected List<? extends ArtifactMappingProvider> artifactMappingProviders;
 
-    //@Inject
-    //protected ApplicationContext applicationContext;
-
     @PostConstruct
     protected void initialize()
     {
-        //artifactMappingProviders = new ArrayList<ArtifactMappingProvider>(
-        //    applicationContext.getBeansOfType( ArtifactMappingProvider.class ).values() );
+        // no op
     }
 
     public ArtifactReference toArtifactReference( String path )
index 1b397c674f160a757d13f6de4093c8b9680baf08..ace302fcbe70686fa3f53f255fe3d65556726a2a 100644 (file)
@@ -88,14 +88,14 @@ public class MetadataTools
     private static final char GROUP_SEPARATOR = '.';
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named( value = "archivaConfiguration#default" )
     private ArchivaConfiguration configuration;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named(value = "fileTypes")
index 1f67853ffa2aa70af9e4cdc76e8367e24bb009d2..6185efe91ff4c2652dd40f17e220edebe3517cdc 100644 (file)
@@ -45,13 +45,13 @@ public class DefaultRepositoryScanner
     implements RepositoryScanner
 {
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private FileTypes filetypes;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private RepositoryContentConsumers consumerUtil;
index 4db22d9e7b4fed028b8f1a5df8f79df752a91928..527fa8bce595d82af1d4b2239e11001dd085e81b 100644 (file)
@@ -66,7 +66,7 @@ public class ArchivaIndexingTaskExecutor
     private Logger log = LoggerFactory.getLogger( ArchivaIndexingTaskExecutor.class );
 
     /**
-     * plexus.requirement
+     *
      */
     private IndexPacker indexPacker;
 
index 4d2c20030e70f1a415de05cea161e582af34a861..ddf5ead7e0d17bedf14476f607a4d464b82b47b4 100644 (file)
@@ -41,7 +41,7 @@ public class IndexingArchivaTaskScheduler
     private Logger log = LoggerFactory.getLogger( IndexingArchivaTaskScheduler.class );
 
     /**
-     * plexus.requirement role-hint="indexing"
+     *
      */
     @Inject
     @Named(value = "taskQueue#indexing")
index 6eae172fb5fa38ab0854cdd0f8f2b1b29dc3a329..a8a7a4c37f4288b39c36659d7cd4c2dc4e33ca50 100644 (file)
@@ -59,7 +59,7 @@ public class ArchivaRepositoryScanningTaskExecutor
     private Logger log = LoggerFactory.getLogger( ArchivaRepositoryScanningTaskExecutor.class );
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named(value="archivaConfiguration#default")
@@ -68,13 +68,13 @@ public class ArchivaRepositoryScanningTaskExecutor
     /**
      * The repository scanner component.
      *
-     * plexus.requirement
+     *
      */
     @Inject
     private RepositoryScanner repoScanner;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private RepositoryContentConsumers consumers;
@@ -82,7 +82,7 @@ public class ArchivaRepositoryScanningTaskExecutor
     private Task task;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private RepositoryStatisticsManager repositoryStatisticsManager;
@@ -90,7 +90,6 @@ public class ArchivaRepositoryScanningTaskExecutor
     /**
      * TODO: may be different implementations
      *
-     * plexus.requirement
      */
     @Inject
     private RepositorySessionFactory repositorySessionFactory;
index 634e5edd3213f65c79a287a781bce21e91fab27b..c9cb9b24ccf98b12831d98bb35284bec3dd92be7 100644 (file)
@@ -64,7 +64,7 @@ public class RepositoryArchivaTaskScheduler
     private Logger log = LoggerFactory.getLogger( RepositoryArchivaTaskScheduler.class );
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private Scheduler scheduler;
@@ -73,20 +73,20 @@ public class RepositoryArchivaTaskScheduler
     private CronExpressionValidator cronValidator;
 
     /**
-     * plexus.requirement role-hint="repository-scanning"
+     *
      */
     @Inject
     @Named( value = "taskQueue#repository-scanning" )
     private TaskQueue repositoryScanningQueue;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private ArchivaConfiguration archivaConfiguration;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named( value = "repositoryStatisticsManager#default" )
@@ -94,8 +94,7 @@ public class RepositoryArchivaTaskScheduler
 
     /**
      * TODO: could have multiple implementations
-     * <p/>
-     * plexus.requirement
+     *
      */
     @Inject
     private RepositorySessionFactory repositorySessionFactory;
index a49f236ee48309bf755114224acb31b86aec61e8..90d983a5f401ca56d2462c9bb6b526c669da7300 100644 (file)
@@ -55,7 +55,7 @@ public class NewArtifactsRssFeedProcessor
     private static final String desc = "These are the new artifacts found in the repository ";
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private RssFeedGenerator generator;
index 285edcbdcf7abc1992fc4c205bf63399749ad899..a41c0df5c4d63fed4ad769054d7b7d148a5a0985 100644 (file)
@@ -55,7 +55,7 @@ public class NewVersionsOfArtifactRssFeedProcessor
     private static final String desc = "These are the new versions of artifact ";
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private RssFeedGenerator generator;
index dd384635bf8426cfaf3880841baef26f4ec44ded..3d76e8427439de6705b5cf34a000467476b93ca5 100644 (file)
@@ -48,7 +48,7 @@ public class ArchivaServletAuthenticator
     private Logger log = LoggerFactory.getLogger( ArchivaServletAuthenticator.class );
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private SecuritySystem securitySystem;
index 4413df0569c993a9e927cb1445a5dbd9270b9430..42b02290218307441c5c0e684691202ec2f4eb35 100644 (file)
@@ -42,7 +42,7 @@ public class ArchivaStandardRolesCheck
     private Logger log = LoggerFactory.getLogger( ArchivaStandardRolesCheck.class );
     
     /**
-     * plexus.requirement role-hint="cached"
+     *
      */
     @Inject @Named(value = "rBACManager#cached")
     private RBACManager rbacManager;
index 698a3752052b76b1adadeb8e611356f2943d0dfd..e7c700c8ffa9bc485497adb14354581dde2321e3 100644 (file)
@@ -49,19 +49,19 @@ public class DefaultUserRepositories
     implements UserRepositories
 {
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private SecuritySystem securitySystem;
 
     /**
-     * plexus.requirement role-hint="default"
+     *
      */
     @Inject
     private RoleManager roleManager;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private ArchivaConfiguration archivaConfiguration;
index d6d3244809e4470739064b0c70deeeba92830432..18b3a23cabad9d563f1927df89dca7aa71301ae0 100644 (file)
@@ -108,54 +108,54 @@ public class ArchivaDavResourceFactory
     private Logger log = LoggerFactory.getLogger( ArchivaDavResourceFactory.class );
 
     /**
-     * plexus.requirement role="org.apache.archiva.audit.AuditListener"
+     *
      */
     @Inject
     private List<AuditListener> auditListeners = new ArrayList<AuditListener>();
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private RepositoryContentFactory repositoryFactory;
 
     /**
-     * plexus.requirement
+     *
      */
     private RepositoryRequest repositoryRequest;
 
     /**
-     * plexus.requirement role-hint="default"
+     *
      */
     @Inject
     @Named( value = "repositoryProxyConnectors#default" )
     private RepositoryProxyConnectors connectors;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private MetadataTools metadataTools;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private MimeTypes mimeTypes;
 
     /**
-     * plexus.requirement
+     *
      */
     private ArchivaConfiguration archivaConfiguration;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private ServletAuthenticator servletAuth;
 
     /**
-     * plexus.requirement role-hint="basic"
+     *
      */
     @Inject
     @Named( value = "httpAuthenticator#basic" )
@@ -167,22 +167,22 @@ public class ArchivaDavResourceFactory
     private final LockManager lockManager = new SimpleLockManager();
 
     /**
-     * plexus.requirement
+     *
      */
     private ChecksumFile checksum;
 
     /**
-     * plexus.requirement role-hint="sha1"
+     *
      */
     private Digester digestSha1;
 
     /**
-     * plexus.requirement role-hint="md5";
+     *
      */
     private Digester digestMd5;
 
     /**
-     * plexus.requirement role="org.apache.archiva.scheduler.ArchivaTaskScheduler" role-hint="repository"
+     *
      */
     @Inject
     @Named( value = "archivaTaskScheduler#repository" )
index f9d70a3d7ef43dbe075e847ea00d2c8b88f08641..0c6ce56dcad669a196a0b5a1c11d11d35de1d17c 100644 (file)
@@ -72,27 +72,22 @@ public class DefaultMetadataResolver
      * ... could be a different type since we need methods to modify the storage metadata, which would also allow more
      * appropriate methods to pass in the already determined repository configuration, for example, instead of the ID
      *
-     * plexus.requirement role-hint="maven2"
+     *
      */
     @Inject
     @Named( value = "repositoryStorage#maven2" )
     private RepositoryStorage repositoryStorage;
 
     /**
-     * plexus.requirement role="org.apache.archiva.repository.events.RepositoryListener"
+     *
      */
     @Inject
     private List<RepositoryListener> listeners;
 
-
-    //@Inject
-    //private ApplicationContext applicationContext;
-
     @PostConstruct
     private void initialize()
     {
-        //listeners =
-        //    new ArrayList<RepositoryListener>( applicationContext.getBeansOfType( RepositoryListener.class ).values() );
+        // no op
     }
 
     public ProjectVersionMetadata resolveProjectVersion( RepositorySession session, String repoId, String namespace,
index 205faec4036102a1a1a33411fde53d04fcd73276..514ab2150b3bd39e7ee6a5f4b9eda196001c7810 100644 (file)
@@ -38,7 +38,7 @@ public class MetadataAuditListener
     private static final Logger log = LoggerFactory.getLogger( MetadataAuditListener.class );
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private AuditManager auditManager;
@@ -47,7 +47,7 @@ public class MetadataAuditListener
      * FIXME: this could be multiple implementations and needs to be configured. It also starts a separate session to
      * the originator of the audit event that we may rather want to pass through.
      *
-     * plexus.requirement
+     *
      */
     @Inject
     private RepositorySessionFactory repositorySessionFactory;
index 6728bc93b03e4d6aff92de0751f5fd535490e097..8a78ed3d6323cf143172edb420c1096480ad5f63 100644 (file)
@@ -103,37 +103,36 @@ public class DefaultDependencyTreeBuilder
     private Logger log = LoggerFactory.getLogger( getClass() );
 
     /**
-     * plexus.requirement
+     *
      */
     private ArtifactFactory factory;
 
     /**
-     * plexus.requirement
+     *
      */
     private ArtifactCollector collector;
 
     /**
-     * plexus.requirement
+     *
      */
     private ModelBuilder builder;
 
     /**
      * TODO: can have other types, and this might eventually come through from the main request
-     * <p/>
-     * plexus.requirement
+     *
      */
     @Inject
     private RepositorySessionFactory repositorySessionFactory;
 
     /**
-     * plexus.requirement role-hint="maven2"
+     *
      */
     @Inject
     @Named( value = "repositoryPathTranslator#maven2" )
     private RepositoryPathTranslator pathTranslator;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named( value = "archivaConfiguration#default" )
index 7b3a0952b2db506cba498dbd2a40dc1b08a330a1..f3473db7cefd07a08fd4188de6919303d99be155 100644 (file)
@@ -88,19 +88,19 @@ public class Maven2RepositoryStorage
     implements RepositoryStorage
 {
     /**
-     * plexus.requirement
+     *
      */
     private ModelBuilder builder;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named( value = "archivaConfiguration#default" )
     private ArchivaConfiguration archivaConfiguration;
 
     /**
-     * plexus.requirement role-hint="maven2"
+     *
      */
     @Inject
     @Named( value = "repositoryPathTranslator#maven2" )
index a43c38f879fd72e4bd2520fbbea40fc1464aa58d..1caae4ecac47072ac684f0ad30aaf2dd7c7559a0 100644 (file)
@@ -43,19 +43,19 @@ public class FileRepositorySessionFactory
     implements RepositorySessionFactory
 {
     /**
-     * plexus.requirement role="org.apache.archiva.metadata.model.MetadataFacetFactory"
+     *
      */
     private Map<String, MetadataFacetFactory> metadataFacetFactories;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     @Named( value = "archivaConfiguration#default" )
     private ArchivaConfiguration configuration;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private MetadataResolver metadataResolver;
index 9c2b69aa5bd808af4b825008e86a75c659099650..7c7f4586156cb037466b5226a8e9f87ce4b472bc 100644 (file)
@@ -47,18 +47,18 @@ public class JcrRepositorySessionFactory
     private ApplicationContext applicationContext;
 
     /**
-     * plexus.requirement role="org.apache.archiva.metadata.model.MetadataFacetFactory"
+     *
      */
     private Map<String, MetadataFacetFactory> metadataFacetFactories;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private Repository repository;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private MetadataResolver metadataResolver;
index fa221d0228556bc6b286bf5a1daa135bb21f3b16..969aab36914d686987941a26b4ad20a13991f0e4 100644 (file)
@@ -79,21 +79,20 @@ public class DuplicateArtifactsConsumer
     private String description = "Check for Duplicate Artifacts via SHA1 Checksums";
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private ArchivaConfiguration configuration;
 
     /**
-     * plexus.requirement
+     *
      */
     @Inject
     private FileTypes filetypes;
 
     /**
      * FIXME: can be of other types
-     * <p/>
-     * plexus.requirement
+     *
      */
     @Inject
     private RepositorySessionFactory repositorySessionFactory;
@@ -106,8 +105,7 @@ public class DuplicateArtifactsConsumer
 
     /**
      * FIXME: needs to be selected based on the repository in question
-     * <p/>
-     * plexus.requirement role-hint="maven2"
+     *
      */
     @Inject
     @Named( value = "repositoryPathTranslator#maven2" )
index 7a97691c065c19a4517528bcd86225c0bdf67028..863fdfa5fad463e8a971d1436bba09c8d34666fd 100644 (file)
@@ -60,12 +60,12 @@ public class Maven2RepositoryMerger
     implements RepositoryMerger
 {
     /**
-     * plexus.requirement role-hint="default"
+     *
      */
     private ArchivaConfiguration configuration;
 
     /**
-     * plexus.requirement role-hint="maven2"
+     *
      */
     private RepositoryPathTranslator pathTranslator;