From ed36598016494ddd26cffb7720ffcf6ac3d64569 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 6 Sep 2011 08:13:32 +0000 Subject: [PATCH] get RID of plexus.configuration annotation git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1165559 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/archiva/cli/ArtifactCountConsumer.java | 4 ++-- .../archiva/converter/artifact/LegacyToDefaultConverter.java | 4 ++-- .../archiva/configuration/DefaultArchivaConfiguration.java | 4 ++-- .../maven/archiva/consumers/core/AutoRemoveConsumer.java | 4 ++-- .../maven/archiva/consumers/core/AutoRenameConsumer.java | 4 ++-- .../maven/archiva/consumers/core/MetadataUpdaterConsumer.java | 4 ++-- .../archiva/consumers/core/ValidateChecksumConsumer.java | 4 ++-- .../consumers/core/repository/RepositoryPurgeConsumer.java | 4 ++-- .../consumers/metadata/ArchivaMetadataCreationConsumer.java | 4 ++-- .../archiva/repository/scanner/InvalidScanConsumer.java | 2 +- .../archiva/repository/scanner/SampleKnownConsumer.java | 2 +- .../archiva/reports/consumers/DuplicateArtifactsConsumer.java | 4 ++-- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArtifactCountConsumer.java b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArtifactCountConsumer.java index 8c7c4ed89..fd66db098 100644 --- a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArtifactCountConsumer.java +++ b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArtifactCountConsumer.java @@ -38,12 +38,12 @@ public class ArtifactCountConsumer implements KnownRepositoryContentConsumer { /** - * plexus.configuration default-value="count-artifacts" + * default-value="count-artifacts" */ private String id = "count-artifacts"; /** - * plexus.configuration default-value="Count Artifacts" + * default-value="Count Artifacts" */ private String description = "Count Artifacts"; diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java index 268667b49..3998442c3 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java +++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java @@ -101,12 +101,12 @@ public class LegacyToDefaultConverter private ArtifactHandlerManager artifactHandlerManager; /** - * plexus.configuration default-value="false" + * default-value="false" */ private boolean force; /** - * plexus.configuration default-value="false" + * default-value="false" */ private boolean dryrun; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java index 34f72d808..dab62ab34 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java @@ -124,13 +124,13 @@ public class DefaultArchivaConfiguration /** * see #initialize - * plexus.configuration default-value="${user.home}/.m2/archiva.xml" + * default-value="${user.home}/.m2/archiva.xml" */ private String userConfigFilename = "${user.home}/.m2/archiva.xml"; /** * see #initialize - * plexus.configuration default-value="${appserver.base}/conf/archiva.xml" + * default-value="${appserver.base}/conf/archiva.xml" */ private String altConfigFilename = "${appserver.base}/conf/archiva.xml"; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java index 751998a34..99fe36e11 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java @@ -52,12 +52,12 @@ public class AutoRemoveConsumer implements KnownRepositoryContentConsumer, RegistryListener { /** - * plexus.configuration default-value="auto-remove" + * default-value="auto-remove" */ private String id = "auto-remove"; /** - * plexus.configuration default-value="Automatically Remove File from Filesystem." + * default-value="Automatically Remove File from Filesystem." */ private String description = "Automatically Remove File from Filesystem."; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java index 09dd5ca33..33a6568bf 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java @@ -48,12 +48,12 @@ public class AutoRenameConsumer implements KnownRepositoryContentConsumer { /** - * plexus.configuration default-value="auto-rename" + * default-value="auto-rename" */ private String id = "auto-rename"; /** - * plexus.configuration default-value="Automatically rename common artifact mistakes." + * default-value="Automatically rename common artifact mistakes." */ private String description = "Automatically rename common artifact mistakes."; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java index 2189a0bfa..a2e657a62 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java @@ -67,12 +67,12 @@ public class MetadataUpdaterConsumer private Logger log = LoggerFactory.getLogger( MetadataUpdaterConsumer.class ); /** - * plexus.configuration default-value="metadata-updater" + * default-value="metadata-updater" */ private String id = "metadata-updater"; /** - * plexus.configuration default-value="Update / Create maven-metadata.xml files" + * default-value="Update / Create maven-metadata.xml files" */ private String description = "Update / Create maven-metadata.xml files"; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java index b0adf3aa5..2487ed727 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java @@ -62,12 +62,12 @@ public class ValidateChecksumConsumer private static final String CHECKSUM_IO_ERROR = "checksum-io-error"; /** - * plexus.configuration default-value="validate-checksums" + * default-value="validate-checksums" */ private String id = "validate-checksums"; /** - * plexus.configuration default-value="Validate checksums against file." + * default-value="Validate checksums against file." */ private String description = "Validate checksums against file."; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java index a690d1566..55ef8f1fd 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java @@ -59,12 +59,12 @@ public class RepositoryPurgeConsumer implements KnownRepositoryContentConsumer, RegistryListener { /** - * plexus.configuration default-value="repository-purge" + * default-value="repository-purge" */ private String id = "repository-purge"; /** - * plexus.configuration default-value="Purge repository of old snapshots" + * default-value="Purge repository of old snapshots" */ private String description = "Purge repository of old snapshots"; 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 f526cb2a9..223d0a353 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 @@ -63,12 +63,12 @@ public class ArchivaMetadataCreationConsumer implements KnownRepositoryContentConsumer, RegistryListener { /** - * plexus.configuration default-value="create-archiva-metadata" + * default-value="create-archiva-metadata" */ private String id = "create-archiva-metadata"; /** - * plexus.configuration default-value="Create basic metadata for Archiva to be able to reference the artifact" + * default-value="Create basic metadata for Archiva to be able to reference the artifact" */ private String description = "Create basic metadata for Archiva to be able to reference the artifact"; diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java index aaeb03197..472848d44 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java @@ -37,7 +37,7 @@ public class InvalidScanConsumer implements InvalidRepositoryContentConsumer { /** - * plexus.configuration default-value="unset-id" + * default-value="unset-id" */ private String id = "unset-id"; diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java index c4cc6fc46..e61bcf2e8 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java @@ -37,7 +37,7 @@ public class SampleKnownConsumer implements KnownRepositoryContentConsumer { /** - * plexus.configuration default-value="unset-id" + * default-value="unset-id" */ private String id = "unset-id"; 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 969aab369..bb033fd28 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 @@ -69,12 +69,12 @@ public class DuplicateArtifactsConsumer private Logger log = LoggerFactory.getLogger( DuplicateArtifactsConsumer.class ); /** - * plexus.configuration default-value="duplicate-artifacts" + * default-value="duplicate-artifacts" */ private String id = "duplicate-artifacts"; /** - * plexus.configuration default-value="Check for Duplicate Artifacts via SHA1 Checksums" + * default-value="Check for Duplicate Artifacts via SHA1 Checksums" */ private String description = "Check for Duplicate Artifacts via SHA1 Checksums";