From 764c9d64245b90cddef47289467a623ec0dac9e4 Mon Sep 17 00:00:00 2001 From: skygo Date: Tue, 25 Feb 2014 02:01:14 +0000 Subject: fix javadoc. Generation possible on jdk8 (fix html content + replace @todo with TODO ) git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1571532 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/archiva/metadata/model/CiManagement.java | 2 +- .../main/java/org/apache/archiva/metadata/model/Dependency.java | 2 +- .../java/org/apache/archiva/metadata/model/IssueManagement.java | 2 +- .../main/java/org/apache/archiva/metadata/model/MailingList.java | 2 +- .../archiva/metadata/repository/DefaultMetadataResolver.java | 8 ++++---- .../apache/archiva/metadata/repository/MetadataRepository.java | 2 +- .../org/apache/archiva/repository/events/RepositoryListener.java | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'archiva-modules/metadata') diff --git a/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/CiManagement.java b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/CiManagement.java index 4662c185d..2b3157056 100644 --- a/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/CiManagement.java +++ b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/CiManagement.java @@ -26,7 +26,7 @@ import java.io.Serializable; /** * Information about the CI system used by the project. * - * @todo considering moving this to a facet - avoid referring to it externally + * TODO considering moving this to a facet - avoid referring to it externally */ @XmlRootElement(name = "ciManagement") public class CiManagement diff --git a/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Dependency.java b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Dependency.java index bf2a5b80e..15bcf24a8 100644 --- a/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Dependency.java +++ b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/Dependency.java @@ -25,7 +25,7 @@ import java.io.Serializable; /** * Information about a dependency that this project has on another project or artifact. * - * @todo will be reviewing what is appropriate for the base here - rest should be in a maven dependency facet - avoid details on it externally + * TODO will be reviewing what is appropriate for the base here - rest should be in a maven dependency facet - avoid details on it externally */ @XmlRootElement(name = "dependency") public class Dependency diff --git a/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/IssueManagement.java b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/IssueManagement.java index 25ba297f7..c10770e5b 100644 --- a/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/IssueManagement.java +++ b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/IssueManagement.java @@ -26,7 +26,7 @@ import java.io.Serializable; /** * Information about the issue management system used by the project. * - * @todo considering moving this to a facet - avoid referring to it externally + * TODO considering moving this to a facet - avoid referring to it externally */ @XmlRootElement(name = "issueManagement") public class IssueManagement diff --git a/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/MailingList.java b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/MailingList.java index ee35302d2..1e56af847 100644 --- a/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/MailingList.java +++ b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/MailingList.java @@ -26,7 +26,7 @@ import java.util.List; /** * Information about the available mailing lists for communicating with the project. * - * @todo considering moving this to a facet - avoid referring to it externally + * TODO considering moving this to a facet - avoid referring to it externally */ @XmlRootElement(name = "mailingList") public class MailingList 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 6d505f13d..469b4cf46 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 @@ -43,19 +43,19 @@ import java.util.List; /** * Default implementation of the metadata resolver API. At present it will handle updating the content repository * from new or changed information in the model and artifacts from the repository storage. - *

+ *

* This is a singleton component to allow an alternate implementation to be provided. It is intended to be the same * system-wide for the whole content repository instead of on a per-managed-repository basis. Therefore, 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. - *

+ *

* Note that the caller is responsible for the session, such as closing and saving (which is implied by the resolver * being obtained from within the session). The {@link RepositorySession#markDirty()} method is used as a hint to ensure * that the session knows we've made changes at close. We cannot ensure the changes will be persisted if the caller * chooses to revert first. This is preferable to storing the metadata immediately - a separate session would require * having a bi-directional link with the session factory, and saving the existing session might save other changes * unknowingly by the caller. - *

+ *

*/ @Service ("metadataResolver#default") public class DefaultMetadataResolver @@ -67,7 +67,7 @@ public class DefaultMetadataResolver /** * FIXME: this needs to be configurable based on storage type - and could also be instantiated per repo. Change to a * factory, and perhaps retrieve from the session. We should avoid creating one per request, however. - *

+ *

* TODO: Also need to accommodate availability of proxy module * ... 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 diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java index 7771351cb..7bec0d6bd 100644 --- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java +++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java @@ -205,7 +205,7 @@ public interface MetadataRepository * @param namespace * @param projectId * @param projectVersion - * @throws MetadataResolutionException + * @throws MetadataRepositoryException * @since 1.4-M4 */ void removeProjectVersion( String repoId, String namespace, String projectId, String projectVersion ) diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/repository/events/RepositoryListener.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/repository/events/RepositoryListener.java index a68c0f171..e23b2ec6a 100644 --- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/repository/events/RepositoryListener.java +++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/repository/events/RepositoryListener.java @@ -28,10 +28,10 @@ import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataE * Listen to events on the repository. This class is a stopgap * refactoring measure until an event bus is in place to handle * generic events such as these. - *

+ *

* This assumes that the events occur before the action has completed, though they don't currently offer any mechanism * to prevent an event from occurring or guarantee that it will happen. - *

+ *

* FIXME: this needs to be made more permanent since 3rd party plugins will depend on it heavily */ public interface RepositoryListener -- cgit v1.2.3