get RID of plexus.configuration annotation

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1165559 13f79535-47bb-0310-9956-ffa450edef68

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 8c7c4ed89b8f836e4a2dfcf2971afd07bed35f3e..fd66db098021202b0585a167f2a9abb57787094a 100644 (file)
--- 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 268667b49c9cdbc5a30f99f79e04b06daa1628cf..3998442c3487c109624d4c4e5421157f3ecc6b03 100644 (file)
--- 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 34f72d8088afe0029386957b1f4a5120b82c4ba9..dab62ab34a4354809c367efcfe6eeef069b3cbac 100644 (file)
--- 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 751998a348be0bdadfb763ce6999ee9b6ccaa8b0..99fe36e112a15f0e91f6787f29c931bf2291d123 100644 (file)
--- 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 09dd5ca333ea91c4b6d00e785ec154c5ebcf482e..33a6568bf9d7d1d2fa91f28dfebaaddd8ddb11a5 100644 (file)
--- 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 2189a0bfa60bf74c903e2122c77c197bceb44749..a2e657a62e0a903917bb067ff0045592f609bab4 100644 (file)
--- 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 b0adf3aa562960097a727af2df03e6052a351692..2487ed7273bd259ab5e4c00edb6f2b01357f1b07 100644 (file)
--- 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 a690d1566eae9cdaaf3164ecb7823730075d2327..55ef8f1fd6c4190b8165278c1c516106afa2c528 100644 (file)
--- 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 f526cb2a9df96345bc1a88315830587e960f1db4..223d0a353bffe2bb7fcafc1def432ca9c9e7fe14 100644 (file)
--- 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 aaeb03197af4985dac2d8483f5bd66ebea577d5e..472848d44a09ef3029577bb87fff20fa0e05682b 100644 (file)
--- 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 c4cc6fc464cdb2b3e11ec5783db5fe45e8489837..e61bcf2e87cd3d8c00fc5015ccdfdb3424090b65 100644 (file)
--- 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 969aab36914d686987941a26b4ad20a13991f0e4..bb033fd28ff03ba9f4a3cf376c117f9f2ea17a24 100644 (file)
--- 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";