From ac4dbb87e1dabcc01722715bce8f38feb0970102 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 6 Sep 2011 08:11:21 +0000 Subject: get RID of plexus.requirement annotation git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1165558 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/archiva/audit/MetadataAuditListener.java | 4 ++-- .../tree/maven2/DefaultDependencyTreeBuilder.java | 13 ++++++------- .../repository/storage/maven2/Maven2RepositoryStorage.java | 6 +++--- .../repository/file/FileRepositorySessionFactory.java | 6 +++--- .../repository/jcr/JcrRepositorySessionFactory.java | 6 +++--- .../reports/consumers/DuplicateArtifactsConsumer.java | 10 ++++------ .../stagerepository/merge/Maven2RepositoryMerger.java | 4 ++-- 7 files changed, 23 insertions(+), 26 deletions(-) (limited to 'archiva-modules/plugins') diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java index 205faec40..514ab2150 100644 --- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java +++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java @@ -38,7 +38,7 @@ public class MetadataAuditListener private static final Logger log = LoggerFactory.getLogger( MetadataAuditListener.class ); /** - * plexus.requirement + * */ @Inject private AuditManager auditManager; @@ -47,7 +47,7 @@ public class MetadataAuditListener * FIXME: this could be multiple implementations and needs to be configured. It also starts a separate session to * the originator of the audit event that we may rather want to pass through. * - * plexus.requirement + * */ @Inject private RepositorySessionFactory repositorySessionFactory; diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java index 6728bc93b..8a78ed3d6 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java @@ -103,37 +103,36 @@ public class DefaultDependencyTreeBuilder private Logger log = LoggerFactory.getLogger( getClass() ); /** - * plexus.requirement + * */ private ArtifactFactory factory; /** - * plexus.requirement + * */ private ArtifactCollector collector; /** - * plexus.requirement + * */ private ModelBuilder builder; /** * TODO: can have other types, and this might eventually come through from the main request - *

- * plexus.requirement + * */ @Inject private RepositorySessionFactory repositorySessionFactory; /** - * plexus.requirement role-hint="maven2" + * */ @Inject @Named( value = "repositoryPathTranslator#maven2" ) private RepositoryPathTranslator pathTranslator; /** - * plexus.requirement + * */ @Inject @Named( value = "archivaConfiguration#default" ) diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java index 7b3a0952b..f3473db7c 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java @@ -88,19 +88,19 @@ public class Maven2RepositoryStorage implements RepositoryStorage { /** - * plexus.requirement + * */ private ModelBuilder builder; /** - * plexus.requirement + * */ @Inject @Named( value = "archivaConfiguration#default" ) private ArchivaConfiguration archivaConfiguration; /** - * plexus.requirement role-hint="maven2" + * */ @Inject @Named( value = "repositoryPathTranslator#maven2" ) diff --git a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java index a43c38f87..1caae4eca 100644 --- a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java +++ b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java @@ -43,19 +43,19 @@ public class FileRepositorySessionFactory implements RepositorySessionFactory { /** - * plexus.requirement role="org.apache.archiva.metadata.model.MetadataFacetFactory" + * */ private Map metadataFacetFactories; /** - * plexus.requirement + * */ @Inject @Named( value = "archivaConfiguration#default" ) private ArchivaConfiguration configuration; /** - * plexus.requirement + * */ @Inject private MetadataResolver metadataResolver; diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java index 9c2b69aa5..7c7f45861 100644 --- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java +++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java @@ -47,18 +47,18 @@ public class JcrRepositorySessionFactory private ApplicationContext applicationContext; /** - * plexus.requirement role="org.apache.archiva.metadata.model.MetadataFacetFactory" + * */ private Map metadataFacetFactories; /** - * plexus.requirement + * */ @Inject private Repository repository; /** - * plexus.requirement + * */ @Inject private MetadataResolver metadataResolver; diff --git a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java index fa221d022..969aab369 100644 --- a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java +++ b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java @@ -79,21 +79,20 @@ public class DuplicateArtifactsConsumer private String description = "Check for Duplicate Artifacts via SHA1 Checksums"; /** - * plexus.requirement + * */ @Inject private ArchivaConfiguration configuration; /** - * plexus.requirement + * */ @Inject private FileTypes filetypes; /** * FIXME: can be of other types - *

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

- * plexus.requirement role-hint="maven2" + * */ @Inject @Named( value = "repositoryPathTranslator#maven2" ) diff --git a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java index 7a97691c0..863fdfa5f 100644 --- a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java +++ b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java @@ -60,12 +60,12 @@ public class Maven2RepositoryMerger implements RepositoryMerger { /** - * plexus.requirement role-hint="default" + * */ private ArchivaConfiguration configuration; /** - * plexus.requirement role-hint="maven2" + * */ private RepositoryPathTranslator pathTranslator; -- cgit v1.2.3