From: Joakim Erdfelt Date: Thu, 5 Apr 2007 22:29:50 +0000 (+0000) Subject: * Adding role names to help plexus:descriptors work. X-Git-Tag: archiva-1.0-alpha-1~113^2~80 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f068e90b016a340c637b866f0c8c8e0b6a3673ee;p=archiva.git * Adding role names to help plexus:descriptors work. * Correcting auto-rename consumer to operate on path. git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches/archiva-jpox-database-refactor@525984 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java index 4ecb1331c..75b99ab1f 100644 --- a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java +++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java @@ -45,7 +45,8 @@ import java.util.Map; * * @author Joakim Erdfelt * @version $Id$ - * @plexus.component role-hint="create-missing-checksums" + * @plexus.component role="org.apache.maven.archiva.consumers.RepositoryContentConsumer" + * role-hint="create-missing-checksums" * instantiation-strategy="per-lookup" */ public class ArtifactMissingChecksumsConsumer extends AbstractMonitoredConsumer diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java index 89e307fd3..a4d7d175e 100644 --- a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java +++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java @@ -40,7 +40,8 @@ import java.util.List; * @author Joakim Erdfelt * @version $Id$ * - * @plexus.component role-hint="auto-remove" + * @plexus.component role="org.apache.maven.archiva.consumers.RepositoryContentConsumer" + * role-hint="auto-remove" * instantiation-strategy="per-lookup" */ public class AutoRemoveConsumer diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java index d1126bfc1..fafed788b 100644 --- a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java +++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java @@ -26,6 +26,7 @@ import org.apache.maven.archiva.model.ArchivaRepository; import org.codehaus.plexus.util.FileUtils; import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -38,7 +39,8 @@ import java.util.Map; * @author Joakim Erdfelt * @version $Id$ * - * @plexus.component role-hint="auto-remove" + * @plexus.component role="org.apache.maven.archiva.consumers.RepositoryContentConsumer" + * role-hint="auto-remove" * instantiation-strategy="per-lookup" */ public class AutoRenameConsumer @@ -55,6 +57,8 @@ public class AutoRenameConsumer */ private String description; + private static final String RENAME_FAILURE = "rename_failure"; + private File repositoryDir; private List includes = new ArrayList(); @@ -125,7 +129,18 @@ public class AutoRenameConsumer String extension = (String) itExtensions.next(); if ( path.endsWith( extension ) ) { - // TODO: FileUtils.rename( from, to ) + String fixedExtension = (String) this.extensionRenameMap.get( extension ); + String correctedPath = path.substring( 0, path.length() - extension.length() ) + fixedExtension; + File to = new File( this.repositoryDir, correctedPath ); + try + { + FileUtils.rename( file, to ); + } + catch ( IOException e ) + { + triggerConsumerWarning( RENAME_FAILURE, "Unable to rename " + path + " to " + correctedPath + + ": " + e.getMessage() ); + } } } diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java index 1fb5a60c2..d89236819 100644 --- a/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java +++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java @@ -42,7 +42,8 @@ import java.util.List; * @author Joakim Erdfelt * @version $Id$ * - * @plexus.component role-hint="validate-checksums" + * @plexus.component role="org.apache.maven.archiva.consumers.RepositoryContentConsumer" + * role-hint="validate-checksums" * instantiation-strategy="per-lookup" */ public class ValidateChecksumConsumer extends AbstractMonitoredConsumer diff --git a/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java b/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java index 69fee0c85..75c8b1f6f 100644 --- a/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java +++ b/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java @@ -49,7 +49,8 @@ import java.util.Map; * @author Joakim Erdfelt * @version $Id$ * - * @plexus.component role-hint="update-db-artifact" + * @plexus.component role="org.apache.maven.archiva.consumers.RepositoryContentConsumer" + * role-hint="update-db-artifact" * instantiation-strategy="per-lookup" */ public class ArtifactUpdateDatabaseConsumer diff --git a/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java b/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java index a1437dffb..36ffb1cf2 100644 --- a/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java +++ b/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java @@ -46,7 +46,8 @@ import java.util.List; * @author Joakim Erdfelt * @version $Id$ * - * @plexus.component role-hint="index-content" + * @plexus.component role="org.apache.maven.archiva.consumers.RepositoryContentConsumer" + * role-hint="index-content" * instantiation-strategy="per-lookup" */ public class IndexContentConsumer diff --git a/archiva-base/archiva-consumers/pom.xml b/archiva-base/archiva-consumers/pom.xml index 8f1ab174f..04ea49810 100644 --- a/archiva-base/archiva-consumers/pom.xml +++ b/archiva-base/archiva-consumers/pom.xml @@ -36,4 +36,13 @@ archiva-lucene-consumers archiva-signature-consumers + + + + + org.codehaus.plexus + plexus-maven-plugin + + +