From fcb311e99c933138834dfe78965a776658d2dbb2 Mon Sep 17 00:00:00 2001 From: John Dennis Casey Date: Fri, 18 Mar 2005 17:06:26 +0000 Subject: [PATCH] o Changed the package name of the POM translator from *.pom to *.translate o Changed the type of notifier created by the nagEmailAddress from 'email' to 'mail' following brett's changes to the maven-components pom. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163614 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/tools/repoclean/RepositoryCleaner.java | 2 +- .../{pom => translate}/PomTranslationException.java | 2 +- .../repoclean/{pom => translate}/PomV3ToV4Translator.java | 4 ++-- .../src/main/resources/META-INF/plexus/components.xml | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) rename sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/{pom => translate}/PomTranslationException.java (97%) rename sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/{pom => translate}/PomV3ToV4Translator.java (99%) diff --git a/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/RepositoryCleaner.java b/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/RepositoryCleaner.java index caa51c7846..aca00443ca 100644 --- a/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/RepositoryCleaner.java +++ b/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/RepositoryCleaner.java @@ -20,8 +20,8 @@ package org.apache.maven.tools.repoclean; import org.apache.maven.tools.repoclean.correlate.ArtifactMd5Correlator; import org.apache.maven.tools.repoclean.correlate.ArtifactPomCorrelator; import org.apache.maven.tools.repoclean.patch.V4ModelPatcher; -import org.apache.maven.tools.repoclean.pom.PomV3ToV4Translator; import org.apache.maven.tools.repoclean.report.Reporter; +import org.apache.maven.tools.repoclean.translate.PomV3ToV4Translator; import org.apache.maven.tools.repoclean.validate.V4ModelIndependenceValidator; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.logging.Logger; diff --git a/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/pom/PomTranslationException.java b/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomTranslationException.java similarity index 97% rename from sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/pom/PomTranslationException.java rename to sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomTranslationException.java index f06f2526be..96b77f5e5e 100644 --- a/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/pom/PomTranslationException.java +++ b/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomTranslationException.java @@ -1,4 +1,4 @@ -package org.apache.maven.tools.repoclean.pom; +package org.apache.maven.tools.repoclean.translate; /* ==================================================================== * Copyright 2001-2004 The Apache Software Foundation. diff --git a/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/pom/PomV3ToV4Translator.java b/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java similarity index 99% rename from sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/pom/PomV3ToV4Translator.java rename to sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java index 2ac0e06a9f..f272b03ae9 100644 --- a/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/pom/PomV3ToV4Translator.java +++ b/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java @@ -1,4 +1,4 @@ -package org.apache.maven.tools.repoclean.pom; +package org.apache.maven.tools.repoclean.translate; import org.apache.maven.model.v4_0_0.Build; import org.apache.maven.model.v4_0_0.CiManagement; @@ -145,7 +145,7 @@ public class PomV3ToV4Translator Notifier notifier = new Notifier(); notifier.setAddress( nagEmailAddress ); - notifier.setType( "email" ); + notifier.setType( "mail" ); ciMgmt = new CiManagement(); ciMgmt.addNotifier( notifier ); diff --git a/sandbox/repoclean/src/main/resources/META-INF/plexus/components.xml b/sandbox/repoclean/src/main/resources/META-INF/plexus/components.xml index 83b14185e6..89552e0791 100644 --- a/sandbox/repoclean/src/main/resources/META-INF/plexus/components.xml +++ b/sandbox/repoclean/src/main/resources/META-INF/plexus/components.xml @@ -10,7 +10,7 @@ org.apache.maven.tools.repoclean.RepositoryCleaner - org.apache.maven.tools.repoclean.pom.PomV3ToV4Translator + org.apache.maven.tools.repoclean.translate.PomV3ToV4Translator org.apache.maven.tools.repoclean.correlate.ArtifactPomCorrelator @@ -32,8 +32,8 @@ | --> - org.apache.maven.tools.repoclean.pom.PomV3ToV4Translator - org.apache.maven.tools.repoclean.pom.PomV3ToV4Translator + org.apache.maven.tools.repoclean.translate.PomV3ToV4Translator + org.apache.maven.tools.repoclean.translate.PomV3ToV4Translator