From 3c082f7e58b0c7ac4c5af3a32c5ce5f9b662aec9 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 24 Apr 2013 12:00:12 +0000 Subject: [PATCH] add some FIXME but not for this release :-) git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1471376 13f79535-47bb-0310-9956-ffa450edef68 --- .../core/repository/RepositoryPurgeConsumer.java | 2 +- .../metadata/ArchivaMetadataCreationConsumer.java | 2 +- .../managed/DefaultManagedRepositoryAdmin.java | 3 +++ .../ArchivaRepositoryScanningTaskExecutor.java | 2 +- .../archiva/rest/services/AbstractRestService.java | 3 +++ .../org/apache/archiva/web/rss/RssFeedServlet.java | 3 +++ .../archiva/audit/MetadataAuditListener.java | 6 ++---- .../consumers/DuplicateArtifactsConsumer.java | 14 +------------- 8 files changed, 15 insertions(+), 20 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java index 79d6efb22..33fd3ee0d 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java @@ -113,7 +113,7 @@ public class RepositoryPurgeConsumer private List listeners = Collections.emptyList(); /** - * TODO: this could be multiple implementations and needs to be configured. + * FIXME: this could be multiple implementations and needs to be configured. */ @Inject private RepositorySessionFactory repositorySessionFactory; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java index 0127bafdd..d7a585ff8 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 @@ -87,7 +87,7 @@ public class ArchivaMetadataCreationConsumer private List includes = new ArrayList( 0 ); /** - * FIXME: can be of other types + * FIXME: this could be multiple implementations and needs to be configured. */ @Inject private RepositorySessionFactory repositorySessionFactory; diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java index 9ba99d7bf..f3c62a023 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java @@ -84,6 +84,9 @@ public class DefaultManagedRepositoryAdmin @Named( value = "archivaTaskScheduler#repository" ) private RepositoryArchivaTaskScheduler repositoryTaskScheduler; + /** + * FIXME: this could be multiple implementations and needs to be configured. + */ @Inject private RepositorySessionFactory repositorySessionFactory; 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 6d1fa1c55..53cfd5558 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 @@ -84,7 +84,7 @@ public class ArchivaRepositoryScanningTaskExecutor private RepositoryStatisticsManager repositoryStatisticsManager; /** - * TODO: may be different implementations + * FIXME: this could be multiple implementations and needs to be configured. */ @Inject private RepositorySessionFactory repositorySessionFactory; diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java index 09e1ad271..bd19e65b2 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java @@ -79,6 +79,9 @@ public abstract class AbstractRestService protected UserRepositories userRepositories; + /** + * FIXME: this could be multiple implementations and needs to be configured. + */ @Inject @Named(value = "repositorySessionFactory") protected RepositorySessionFactory repositorySessionFactory; diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java index d49097a11..a16388301 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java @@ -87,6 +87,9 @@ public class RssFeedServlet private HttpAuthenticator httpAuth; + /** + * FIXME: this could be multiple implementations and needs to be configured. + */ private RepositorySessionFactory repositorySessionFactory; public void init( javax.servlet.ServletConfig servletConfig ) 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 1802feb07..cbbb84484 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 @@ -44,10 +44,8 @@ public class MetadataAuditListener private AuditManager auditManager; /** - * 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. - * - * + * 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. */ @Inject private RepositorySessionFactory repositorySessionFactory; 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 a2ceb9764..c1007aca9 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 @@ -66,30 +66,18 @@ public class DuplicateArtifactsConsumer { private Logger log = LoggerFactory.getLogger( DuplicateArtifactsConsumer.class ); - /** - * default-value="duplicate-artifacts" - */ private String id = "duplicate-artifacts"; - /** - * default-value="Check for Duplicate Artifacts via SHA1 Checksums" - */ private String description = "Check for Duplicate Artifacts via SHA1 Checksums"; - /** - * - */ @Inject private ArchivaConfiguration configuration; - /** - * - */ @Inject private FileTypes filetypes; /** - * FIXME: can be of other types + * FIXME: this could be multiple implementations and needs to be configured. */ @Inject private RepositorySessionFactory repositorySessionFactory; -- 2.39.5