Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/FindbugsPluginRelocator.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/FindbugsPluginRelocator.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/FindbugsPluginRelocator.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/FindbugsPluginRelocator.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/FindbugsPluginRelocator.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/FindbugsPluginRelocator.java (original) +++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/FindbugsPluginRelocator.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.relocators; +package org.apache.maven.model.converter.relocators; /* * Copyright 2006 The Apache Software Foundation. @@ -21,7 +21,7 @@ * * @author Dennis Lundberg * @version $Id: FindbugsPluginRelocator.java 411318 2006-06-02 22:34:35 +0000 (fr, 02 jun 2006) carlos $ - * @plexus.component role="org.apache.maven.maven1converter.relocators.PluginRelocator" + * @plexus.component role="org.apache.maven.model.converter.relocators.PluginRelocator" * role-hint="findbugs" */ public class FindbugsPluginRelocator extends AbstractSourceForgePluginRelocator
Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/JdependPluginRelocator.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/JdependPluginRelocator.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/JdependPluginRelocator.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/JdependPluginRelocator.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/JdependPluginRelocator.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/JdependPluginRelocator.java (original) +++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/JdependPluginRelocator.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.relocators; +package org.apache.maven.model.converter.relocators; /* * Copyright 2006 The Apache Software Foundation. @@ -21,13 +21,13 @@ * * @author Dennis Lundberg * @version $Id: TasklistPluginRelocator.java 411318 2006-06-02 22:34:35 +0000 (fr, 02 jun 2006) carlos $ - * @plexus.component role="org.apache.maven.maven1converter.relocators.PluginRelocator" + * @plexus.component role="org.apache.maven.model.converter.relocators.PluginRelocator" * role-hint="jdepend" */ public class JdependPluginRelocator extends AbstractPluginRelocator { /** - * @see org.apache.maven.maven1converter.relocators.AbstractPluginRelocator#getNewArtifactId() + * @see org.apache.maven.model.converter.relocators.AbstractPluginRelocator#getNewArtifactId() */ public String getNewArtifactId() { @@ -35,7 +35,7 @@ } /** - * @see org.apache.maven.maven1converter.relocators.AbstractPluginRelocator#getNewGroupId() + * @see org.apache.maven.model.converter.relocators.AbstractPluginRelocator#getNewGroupId() */ public String getNewGroupId() { @@ -43,7 +43,7 @@ } /** - * @see org.apache.maven.maven1converter.relocators.AbstractPluginRelocator#getOldArtifactId() + * @see org.apache.maven.model.converter.relocators.AbstractPluginRelocator#getOldArtifactId() */ public String getOldArtifactId() { Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/JdiffPluginRelocator.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/JdiffPluginRelocator.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/JdiffPluginRelocator.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/JdiffPluginRelocator.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/JdiffPluginRelocator.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/JdiffPluginRelocator.java (original) +++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/JdiffPluginRelocator.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.relocators; +package org.apache.maven.model.converter.relocators; /* * Copyright 2006 The Apache Software Foundation. @@ -21,7 +21,7 @@ * * @author Dennis Lundberg * @version $Id: JdiffPluginRelocator.java 411318 2006-06-02 22:34:35 +0000 (fr, 02 jun 2006) carlos $ - * @plexus.component role="org.apache.maven.maven1converter.relocators.PluginRelocator" + * @plexus.component role="org.apache.maven.model.converter.relocators.PluginRelocator" * role-hint="jdiff" */ public class JdiffPluginRelocator extends AbstractPluginRelocator Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/JunitReportPluginRelocator.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/JunitReportPluginRelocator.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/JunitReportPluginRelocator.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/JunitReportPluginRelocator.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/JunitReportPluginRelocator.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/JunitReportPluginRelocator.java (original) +++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/JunitReportPluginRelocator.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.relocators; +package org.apache.maven.model.converter.relocators; /* * Copyright 2006 The Apache Software Foundation. @@ -21,13 +21,13 @@ * * @author Dennis Lundberg * @version $Id: JunitReportPluginRelocator.java 411318 2006-06-02 22:34:35 +0000 (fr, 02 jun 2006) carlos $ - * @plexus.component role="org.apache.maven.maven1converter.relocators.PluginRelocator" + * @plexus.component role="org.apache.maven.model.converter.relocators.PluginRelocator" * role-hint="junit-report" */ public class JunitReportPluginRelocator extends AbstractPluginRelocator { /** - * @see org.apache.maven.maven1converter.relocators.AbstractPluginRelocator#getNewArtifactId() + * @see org.apache.maven.model.converter.relocators.AbstractPluginRelocator#getNewArtifactId() */ public String getNewArtifactId() { @@ -35,7 +35,7 @@ } /** - * @see org.apache.maven.maven1converter.relocators.AbstractPluginRelocator#getNewGroupId() + * @see org.apache.maven.model.converter.relocators.AbstractPluginRelocator#getNewGroupId() */ public String getNewGroupId() { @@ -43,7 +43,7 @@ } /** - * @see org.apache.maven.maven1converter.relocators.AbstractPluginRelocator#getOldArtifactId() + * @see org.apache.maven.model.converter.relocators.AbstractPluginRelocator#getOldArtifactId() */ public String getOldArtifactId() { Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/LicenseRelocator.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/LicenseRelocator.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/LicenseRelocator.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/LicenseRelocator.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/LicenseRelocator.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/LicenseRelocator.java (original) +++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/LicenseRelocator.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.relocators; +package org.apache.maven.model.converter.relocators; /* * Copyright 2006 The Apache Software Foundation. @@ -21,13 +21,13 @@ * * @author Dennis Lundberg * @version $Id: LicenseRelocator.java 411318 2006-06-02 22:34:35 +0000 (fr, 02 jun 2006) carlos $ - * @plexus.component role="org.apache.maven.maven1converter.relocators.PluginRelocator" + * @plexus.component role="org.apache.maven.model.converter.relocators.PluginRelocator" * role-hint="license" */ public class LicenseRelocator extends AbstractPluginRelocator { /** - * @see org.apache.maven.maven1converter.relocators.AbstractPluginRelocator#getNewArtifactId() + * @see org.apache.maven.model.converter.relocators.AbstractPluginRelocator#getNewArtifactId() */ public String getNewArtifactId() { @@ -35,7 +35,7 @@ } /** - * @see org.apache.maven.maven1converter.relocators.AbstractPluginRelocator#getNewGroupId() + * @see org.apache.maven.model.converter.relocators.AbstractPluginRelocator#getNewGroupId() */ public String getNewGroupId() { @@ -43,7 +43,7 @@ } /** - * @see org.apache.maven.maven1converter.relocators.AbstractPluginRelocator#getOldArtifactId() + * @see org.apache.maven.model.converter.relocators.AbstractPluginRelocator#getOldArtifactId() */ public String getOldArtifactId() { Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/NoSuchPluginRelocatorException.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/NoSuchPluginRelocatorException.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/NoSuchPluginRelocatorException.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/NoSuchPluginRelocatorException.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/NoSuchPluginRelocatorException.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/NoSuchPluginRelocatorException.java (original) +++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/NoSuchPluginRelocatorException.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.relocators; +package org.apache.maven.model.converter.relocators; /* * Copyright 2006 The Apache Software Foundation. Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/PluginRelocator.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/PluginRelocator.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/PluginRelocator.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/PluginRelocator.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/PluginRelocator.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/PluginRelocator.java (original) +++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/PluginRelocator.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.relocators; +package org.apache.maven.model.converter.relocators; /* * Copyright 2006 The Apache Software Foundation. @@ -17,7 +17,6 @@ */ import org.apache.maven.model.Model; -import org.apache.maven.plugin.MojoExecutionException; /** * A plugin relocator handles a plugin that has changed its groupId and/or @@ -35,8 +34,6 @@ * Relocate a plugin from one groupId/artifactId to another. * * @param v4Model The model where we look for the plugin - * @throws MojoExecutionException */ - void relocate( Model v4Model ) - throws MojoExecutionException; + void relocate( Model v4Model ); } Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/PluginRelocatorManager.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/PluginRelocatorManager.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/PluginRelocatorManager.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/PluginRelocatorManager.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/PluginRelocatorManager.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/PluginRelocatorManager.java (original) +++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/PluginRelocatorManager.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.relocators; +package org.apache.maven.model.converter.relocators; import java.util.Collection; Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/SimianPluginRelocator.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/SimianPluginRelocator.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/SimianPluginRelocator.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/SimianPluginRelocator.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/SimianPluginRelocator.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/SimianPluginRelocator.java (original) +++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/SimianPluginRelocator.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.relocators; +package org.apache.maven.model.converter.relocators; /* * Copyright 2006 The Apache Software Foundation. @@ -21,7 +21,7 @@ * * @author Dennis Lundberg * @version $Id: SimianPluginRelocator.java 411318 2006-06-02 22:34:35 +0000 (fr, 02 jun 2006) carlos $ - * @plexus.component role="org.apache.maven.maven1converter.relocators.PluginRelocator" + * @plexus.component role="org.apache.maven.model.converter.relocators.PluginRelocator" * role-hint="simian" */ public class SimianPluginRelocator extends AbstractPluginRelocator Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/TasklistPluginRelocator.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/TasklistPluginRelocator.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/TasklistPluginRelocator.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/TasklistPluginRelocator.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/TasklistPluginRelocator.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/TasklistPluginRelocator.java (original) +++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/TasklistPluginRelocator.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.relocators; +package org.apache.maven.model.converter.relocators; /* * Copyright 2006 The Apache Software Foundation. @@ -21,7 +21,7 @@ * * @author Dennis Lundberg * @version $Id: TasklistPluginRelocator.java 411318 2006-06-02 22:34:35 +0000 (fr, 02 jun 2006) carlos $ - * @plexus.component role="org.apache.maven.maven1converter.relocators.PluginRelocator" + * @plexus.component role="org.apache.maven.model.converter.relocators.PluginRelocator" * role-hint="tasklist" */ public class TasklistPluginRelocator extends AbstractPluginRelocator Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/XdocPluginRelocator.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/XdocPluginRelocator.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/XdocPluginRelocator.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/XdocPluginRelocator.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/XdocPluginRelocator.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/XdocPluginRelocator.java (original) +++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/XdocPluginRelocator.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.relocators; +package org.apache.maven.model.converter.relocators; /* * Copyright 2006 The Apache Software Foundation. @@ -21,7 +21,7 @@ * * @author Dennis Lundberg * @version $Id: XdocPluginRelocator.java 411318 2006-06-02 22:34:35 +0000 (fr, 02 jun 2006) carlos $ - * @plexus.component role="org.apache.maven.maven1converter.relocators.PluginRelocator" + * @plexus.component role="org.apache.maven.model.converter.relocators.PluginRelocator" * role-hint="xdoc" */ public class XdocPluginRelocator extends AbstractPluginRelocator Copied: maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/AbstractPCCTest.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/AbstractPCCTest.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/AbstractPCCTest.java?p2=maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/AbstractPCCTest.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/AbstractPCCTest.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/AbstractPCCTest.java (original) +++ maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/AbstractPCCTest.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.plugins; +package org.apache.maven.model.converter.plugins; /* * Copyright 2006 The Apache Software Foundation. Copied: maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCChangelogTest.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCChangelogTest.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCChangelogTest.java?p2=maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCChangelogTest.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCChangelogTest.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCChangelogTest.java (original) +++ maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCChangelogTest.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.plugins; +package org.apache.maven.model.converter.plugins; /* * Copyright 2006 The Apache Software Foundation. @@ -17,7 +17,7 @@ */ import junit.framework.Assert; -import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.model.converter.ProjectConverterException; import org.codehaus.plexus.util.xml.Xpp3Dom; import java.io.IOException; @@ -26,7 +26,8 @@ * @author Dennis Lundberg * @version $Id: PCCChangelogTest.java 409264 2006-05-24 23:13:13 +0000 (on, 24 maj 2006) carlos $ */ -public class PCCChangelogTest extends AbstractPCCTest +public class PCCChangelogTest + extends AbstractPCCTest { protected void setUp() throws Exception @@ -70,7 +71,7 @@ Assert.fail( "Wrong number of date elements" ); } } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { Assert.fail( e.getMessage() ); } @@ -94,7 +95,7 @@ value = configuration.getChild( "range" ).getValue(); Assert.assertEquals( "check range value", "120", value ); } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { Assert.fail( e.getMessage() ); } @@ -126,7 +127,7 @@ Assert.fail( "Wrong number of tag elements" ); } } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { Assert.fail( e.getMessage() ); } Copied: maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCChangesTest.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCChangesTest.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCChangesTest.java?p2=maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCChangesTest.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCChangesTest.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCChangesTest.java (original) +++ maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCChangesTest.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.plugins; +package org.apache.maven.model.converter.plugins; /* * Copyright 2006 The Apache Software Foundation. @@ -17,7 +17,7 @@ */ import junit.framework.Assert; -import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.model.converter.ProjectConverterException; import java.io.IOException; @@ -25,7 +25,8 @@ * @author Dennis Lundberg * @version $Id: PCCChangesTest.java 409264 2006-05-24 23:13:13 +0000 (on, 24 maj 2006) carlos $ */ -public class PCCChangesTest extends AbstractPCCTest +public class PCCChangesTest + extends AbstractPCCTest { protected void setUp() throws Exception @@ -46,7 +47,7 @@ String value = configuration.getChild( "link_template" ).getValue(); Assert.assertEquals( "check link_template value", "%URL%/browse/%ISSUE%", value ); } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { Assert.fail( e.getMessage() ); } Copied: maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCCheckstyleTest.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCCheckstyleTest.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCCheckstyleTest.java?p2=maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCCheckstyleTest.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCCheckstyleTest.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCCheckstyleTest.java (original) +++ maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCCheckstyleTest.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.plugins; +package org.apache.maven.model.converter.plugins; /* * Copyright 2006 The Apache Software Foundation. @@ -17,7 +17,7 @@ */ import junit.framework.Assert; -import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.model.converter.ProjectConverterException; import java.io.IOException; @@ -25,7 +25,8 @@ * @author Dennis Lundberg * @version $Id: PCCCheckstyleTest.java 409264 2006-05-24 23:13:13 +0000 (on, 24 maj 2006) carlos $ */ -public class PCCCheckstyleTest extends AbstractPCCTest +public class PCCCheckstyleTest + extends AbstractPCCTest { protected void setUp() throws Exception @@ -73,7 +74,7 @@ value = configuration.getChild( "useFile" ).getValue(); Assert.assertEquals( "check useFile value", "true", value ); } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { Assert.fail( e.getMessage() ); } @@ -91,7 +92,6 @@ pluginConfigurationConverter.buildConfiguration( configuration, v3Model, projectProperties ); - String value = configuration.getChild( "configLocation" ).getValue(); Assert.assertEquals( "check configLocation value", "http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/avalon_checks.xml";, @@ -103,7 +103,7 @@ value = configuration.getChild( "outputFileFormat" ).getValue(); Assert.assertEquals( "check outputFileFormat value", "xml", value ); } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { Assert.fail( e.getMessage() ); } @@ -124,7 +124,7 @@ String value = configuration.getChild( "configLocation" ).getValue(); Assert.assertEquals( "check configLocation value", "checkstyle.xml", value ); } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { Assert.fail( e.getMessage() ); } Copied: maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCCompilerTest.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCCompilerTest.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCCompilerTest.java?p2=maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCCompilerTest.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCCompilerTest.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCCompilerTest.java (original) +++ maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCCompilerTest.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.plugins; +package org.apache.maven.model.converter.plugins; /* * Copyright 2006 The Apache Software Foundation. @@ -17,7 +17,7 @@ */ import junit.framework.Assert; -import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.model.converter.ProjectConverterException; import java.io.IOException; @@ -25,7 +25,8 @@ * @author Dennis Lundberg * @version $Id$ */ -public class PCCCompilerTest extends AbstractPCCTest +public class PCCCompilerTest + extends AbstractPCCTest { protected void setUp() throws Exception @@ -79,9 +80,9 @@ value = configuration.getChild( "verbose" ).getValue(); Assert.assertEquals( "check verbose value", "false", value ); } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { - Assert.fail(); + Assert.fail( e.getMessage() ); } catch ( IOException e ) { Copied: maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCJarTest.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCJarTest.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCJarTest.java?p2=maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCJarTest.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCJarTest.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCJarTest.java (original) +++ maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCJarTest.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.plugins; +package org.apache.maven.model.converter.plugins; /* * Copyright 2006 The Apache Software Foundation. @@ -17,7 +17,7 @@ */ import junit.framework.Assert; -import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.model.converter.ProjectConverterException; import org.codehaus.plexus.util.xml.Xpp3Dom; import java.io.IOException; @@ -26,7 +26,8 @@ * @author Dennis Lundberg * @version $Id: PCCJarTest.java 409264 2006-05-24 23:13:13 +0000 (on, 24 maj 2006) carlos $ */ -public class PCCJarTest extends AbstractPCCTest +public class PCCJarTest + extends AbstractPCCTest { protected void setUp() throws Exception @@ -85,7 +86,7 @@ value = configuration.getChild( "finalName" ).getValue(); Assert.assertEquals( "check finalName value", "my.jar", value ); } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { Assert.fail( e.getMessage() ); } Copied: maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCJavadocTest.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCJavadocTest.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCJavadocTest.java?p2=maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCJavadocTest.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCJavadocTest.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCJavadocTest.java (original) +++ maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCJavadocTest.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.plugins; +package org.apache.maven.model.converter.plugins; /* * Copyright 2006 The Apache Software Foundation. @@ -17,7 +17,7 @@ */ import junit.framework.Assert; -import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.model.converter.ProjectConverterException; import org.codehaus.plexus.util.xml.Xpp3Dom; import java.io.IOException; @@ -26,7 +26,8 @@ * @author Dennis Lundberg * @version $Id: PCCJavadocTest.java 409264 2006-05-24 23:13:13 +0000 (on, 24 maj 2006) carlos $ */ -public class PCCJavadocTest extends AbstractPCCTest +public class PCCJavadocTest + extends AbstractPCCTest { protected void setUp() throws Exception @@ -152,7 +153,7 @@ value = configuration.getChild( "windowtitle" ).getValue(); Assert.assertEquals( "check windowtitle value", "The title", value ); } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { Assert.fail( e.getMessage() ); } @@ -173,7 +174,7 @@ String value = configuration.getChild( "show" ).getValue(); Assert.assertEquals( "check show value", "package", value ); } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { Assert.fail( e.getMessage() ); } @@ -194,7 +195,7 @@ String value = configuration.getChild( "show" ).getValue(); Assert.assertEquals( "check show value", "private", value ); } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { Assert.fail( e.getMessage() ); } @@ -215,7 +216,7 @@ String value = configuration.getChild( "show" ).getValue(); Assert.assertEquals( "check show value", "public", value ); } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { Assert.fail( e.getMessage() ); } Copied: maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCPmdTest.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCPmdTest.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCPmdTest.java?p2=maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCPmdTest.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCPmdTest.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCPmdTest.java (original) +++ maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCPmdTest.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.plugins; +package org.apache.maven.model.converter.plugins; /* * Copyright 2006 The Apache Software Foundation. @@ -17,7 +17,7 @@ */ import junit.framework.Assert; -import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.model.converter.ProjectConverterException; import org.codehaus.plexus.util.xml.Xpp3Dom; import java.io.IOException; @@ -26,7 +26,8 @@ * @author Dennis Lundberg * @version $Id: PCCPmdTest.java 409264 2006-05-24 23:13:13 +0000 (on, 24 maj 2006) carlos $ */ -public class PCCPmdTest extends AbstractPCCTest +public class PCCPmdTest + extends AbstractPCCTest { protected void setUp() throws Exception @@ -74,7 +75,7 @@ value = configuration.getChild( "targetJdk" ).getValue(); Assert.assertEquals( "check targetJdk value", "1.4", value ); } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { Assert.fail( e.getMessage() ); } Copied: maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCSurefireTest.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCSurefireTest.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCSurefireTest.java?p2=maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCSurefireTest.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCSurefireTest.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCSurefireTest.java (original) +++ maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCSurefireTest.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.plugins; +package org.apache.maven.model.converter.plugins; /* * Copyright 2006 The Apache Software Foundation. @@ -17,7 +17,7 @@ */ import junit.framework.Assert; -import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.model.converter.ProjectConverterException; import org.codehaus.plexus.util.xml.Xpp3Dom; import java.io.IOException; @@ -26,7 +26,8 @@ * @author Dennis Lundberg * @version $Id$ */ -public class PCCSurefireTest extends AbstractPCCTest +public class PCCSurefireTest + extends AbstractPCCTest { protected void setUp() throws Exception @@ -81,7 +82,7 @@ value = configuration.getChild( "skip" ).getValue(); Assert.assertEquals( "check skip value", "true", value ); } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { Assert.fail(); } @@ -102,7 +103,7 @@ String value = configuration.getChild( "forkMode" ).getValue(); Assert.assertEquals( "check forkMode value", "once", value ); } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { Assert.fail(); } @@ -123,7 +124,7 @@ String value = configuration.getChild( "forkMode" ).getValue(); Assert.assertEquals( "check forkMode value", "once", value ); } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { Assert.fail(); } @@ -144,7 +145,7 @@ String value = configuration.getChild( "forkMode" ).getValue(); Assert.assertEquals( "check forkMode value", "perTest", value ); } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { Assert.fail(); } Copied: maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCTaglistTest.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCTaglistTest.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCTaglistTest.java?p2=maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCTaglistTest.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCTaglistTest.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCTaglistTest.java (original) +++ maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCTaglistTest.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.plugins; +package org.apache.maven.model.converter.plugins; /* * Copyright 2006 The Apache Software Foundation. @@ -17,7 +17,7 @@ */ import junit.framework.Assert; -import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.model.converter.ProjectConverterException; import java.io.IOException; @@ -25,7 +25,8 @@ * @author Dennis Lundberg * @version $Id: PCCTaglistTest.java 410688 2006-05-31 22:21:07 +0000 (on, 31 maj 2006) carlos $ */ -public class PCCTaglistTest extends AbstractPCCTest +public class PCCTaglistTest + extends AbstractPCCTest { protected void setUp() throws Exception @@ -46,7 +47,7 @@ String value = configuration.getChild( "tags" ).getValue(); Assert.assertEquals( "check tags value", "@fixme", value ); } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { Assert.fail(); } Copied: maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCWarTest.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCWarTest.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCWarTest.java?p2=maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCWarTest.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCWarTest.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCWarTest.java (original) +++ maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCWarTest.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.plugins; +package org.apache.maven.model.converter.plugins; /* * Copyright 2006 The Apache Software Foundation. @@ -17,7 +17,7 @@ */ import junit.framework.Assert; -import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.model.converter.ProjectConverterException; import org.codehaus.plexus.util.xml.Xpp3Dom; import java.io.IOException; @@ -26,7 +26,8 @@ * @author Dennis Lundberg * @version $Id: PCCWarTest.java 409264 2006-05-24 23:13:13 +0000 (on, 24 maj 2006) carlos $ */ -public class PCCWarTest extends AbstractPCCTest +public class PCCWarTest + extends AbstractPCCTest { protected void setUp() throws Exception @@ -47,7 +48,7 @@ String value = configuration.getChild( "warSourceDirectory" ).getValue(); Assert.assertEquals( "check warSourceDirectory value", "myWebappDirectory", value ); } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { Assert.fail( e.getMessage() ); } @@ -68,7 +69,7 @@ String value = configuration.getChild( "warSourceDirectory" ).getValue(); Assert.assertEquals( "check warSourceDirectory value", "myWebappDirectory", value ); } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { Assert.fail( e.getMessage() ); } @@ -89,7 +90,7 @@ Xpp3Dom child = configuration.getChild( "warSourceDirectory" ); Assert.assertEquals( "check warSourceDirectory element", null, child ); } - catch ( MojoExecutionException e ) + catch ( ProjectConverterException e ) { Assert.fail( e.getMessage() ); } Copied: maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PropertyUtilsTest.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PropertyUtilsTest.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PropertyUtilsTest.java?p2=maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PropertyUtilsTest.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PropertyUtilsTest.java&r1=420108&r2=423493&rev=423493&view=diff ============================================================================== --- maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PropertyUtilsTest.java (original) +++ maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PropertyUtilsTest.java Wed Jul 19 08:30:31 2006 @@ -1,4 +1,4 @@ -package org.apache.maven.maven1converter.plugins; +package org.apache.maven.model.converter.plugins; /* * Copyright 2006 The Apache Software Foundation.
