Author: olamy
Date: Tue Sep 6 08:13:32 2011
New Revision: 1165559
URL: http://svn.apache.org/viewvc?rev=1165559&view=rev
Log:
get RID of plexus.configuration annotation
Modified:
archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArtifactCountConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java
archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
Modified:
archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArtifactCountConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArtifactCountConsumer.java?rev=1165559&r1=1165558&r2=1165559&view=diff
==============================================================================
---
archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArtifactCountConsumer.java
(original)
+++
archiva/trunk/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArtifactCountConsumer.java
Tue Sep 6 08:13:32 2011
@@ -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";
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java?rev=1165559&r1=1165558&r2=1165559&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
Tue Sep 6 08:13:32 2011
@@ -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;
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java?rev=1165559&r1=1165558&r2=1165559&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
Tue Sep 6 08:13:32 2011
@@ -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";
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java?rev=1165559&r1=1165558&r2=1165559&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
Tue Sep 6 08:13:32 2011
@@ -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.";
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java?rev=1165559&r1=1165558&r2=1165559&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java
Tue Sep 6 08:13:32 2011
@@ -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.";
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java?rev=1165559&r1=1165558&r2=1165559&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
Tue Sep 6 08:13:32 2011
@@ -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";
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java?rev=1165559&r1=1165558&r2=1165559&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
Tue Sep 6 08:13:32 2011
@@ -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.";
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java?rev=1165559&r1=1165558&r2=1165559&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
Tue Sep 6 08:13:32 2011
@@ -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";
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java?rev=1165559&r1=1165558&r2=1165559&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
Tue Sep 6 08:13:32 2011
@@ -63,12 +63,12 @@ public class ArchivaMetadataCreationCons
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";
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java?rev=1165559&r1=1165558&r2=1165559&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java
Tue Sep 6 08:13:32 2011
@@ -37,7 +37,7 @@ public class InvalidScanConsumer
implements InvalidRepositoryContentConsumer
{
/**
- * plexus.configuration default-value="unset-id"
+ * default-value="unset-id"
*/
private String id = "unset-id";
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java?rev=1165559&r1=1165558&r2=1165559&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java
Tue Sep 6 08:13:32 2011
@@ -37,7 +37,7 @@ public class SampleKnownConsumer
implements KnownRepositoryContentConsumer
{
/**
- * plexus.configuration default-value="unset-id"
+ * default-value="unset-id"
*/
private String id = "unset-id";
Modified:
archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java?rev=1165559&r1=1165558&r2=1165559&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
(original)
+++
archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
Tue Sep 6 08:13:32 2011
@@ -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";