You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ev...@apache.org on 2006/07/19 17:30:37 UTC
svn commit: r423493 [1/2] - in /maven:
components/trunk/maven-model-converter/
components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/
components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/...
Author: evenisse
Date: Wed Jul 19 08:30:31 2006
New Revision: 423493
URL: http://svn.apache.org/viewvc?rev=423493&view=rev
Log:
Move maven1 project converter from sandbox/plugins/maven-maven1-plugin to maven-model-converter
Added:
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/Maven1Converter.java (with props)
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ModelUtils.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/ModelUtils.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ProjectConverterException.java (with props)
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/AbstractPluginConfigurationConverter.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/AbstractPluginConfigurationConverter.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChangelog.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCChangelog.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChanges.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCChanges.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCCheckstyle.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCCheckstyle.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCCompiler.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCCompiler.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJar.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCJar.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCJavadoc.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCMultiproject.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCMultiproject.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCPmd.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCPmd.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCSurefire.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCSurefire.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCTaglist.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCTaglist.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCWar.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCWar.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PluginConfigurationConverter.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PluginConfigurationConverter.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PropertyUtils.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PropertyUtils.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/AbstractPluginRelocator.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/AbstractPluginRelocator.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/AbstractSourceForgePluginRelocator.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/AbstractSourceForgePluginRelocator.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/CoberturaPluginRelocator.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/CoberturaPluginRelocator.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/DefaultPluginRelocatorManager.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/DefaultPluginRelocatorManager.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/DeveloperActivityPluginRelocator.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/DeveloperActivityPluginRelocator.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/FaqPluginRelocator.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/FaqPluginRelocator.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/FileActivityPluginRelocator.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/FileActivityPluginRelocator.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/FindbugsPluginRelocator.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/FindbugsPluginRelocator.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/JdependPluginRelocator.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/JdependPluginRelocator.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/JdiffPluginRelocator.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/JdiffPluginRelocator.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/JunitReportPluginRelocator.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/JunitReportPluginRelocator.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/LicenseRelocator.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/LicenseRelocator.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/NoSuchPluginRelocatorException.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/NoSuchPluginRelocatorException.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/PluginRelocator.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/PluginRelocator.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/PluginRelocatorManager.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/PluginRelocatorManager.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/SimianPluginRelocator.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/SimianPluginRelocator.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/TasklistPluginRelocator.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/TasklistPluginRelocator.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/XdocPluginRelocator.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/XdocPluginRelocator.java
maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/
maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/AbstractPCCTest.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/AbstractPCCTest.java
maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCChangelogTest.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCChangelogTest.java
maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCChangesTest.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCChangesTest.java
maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCCheckstyleTest.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCCheckstyleTest.java
maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCCompilerTest.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCCompilerTest.java
maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCJarTest.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCJarTest.java
maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCJavadocTest.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCJavadocTest.java
maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCPmdTest.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCPmdTest.java
maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCSurefireTest.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCSurefireTest.java
maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCTaglistTest.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCTaglistTest.java
maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCWarTest.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCWarTest.java
maven/components/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PropertyUtilsTest.java
- copied, changed from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PropertyUtilsTest.java
maven/components/trunk/maven-model-converter/src/test/resources/
maven/components/trunk/maven-model-converter/src/test/resources/PCCChangelogTest1.properties
- copied unchanged from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCChangelogTest1.properties
maven/components/trunk/maven-model-converter/src/test/resources/PCCChangelogTest2.properties
- copied unchanged from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCChangelogTest2.properties
maven/components/trunk/maven-model-converter/src/test/resources/PCCChangelogTest3.properties
- copied unchanged from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCChangelogTest3.properties
maven/components/trunk/maven-model-converter/src/test/resources/PCCChangesTest.properties
- copied unchanged from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCChangesTest.properties
maven/components/trunk/maven-model-converter/src/test/resources/PCCCheckstyleTest1.properties
- copied unchanged from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCCheckstyleTest1.properties
maven/components/trunk/maven-model-converter/src/test/resources/PCCCheckstyleTest2.properties
- copied unchanged from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCCheckstyleTest2.properties
maven/components/trunk/maven-model-converter/src/test/resources/PCCCheckstyleTest3.properties
- copied unchanged from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCCheckstyleTest3.properties
maven/components/trunk/maven-model-converter/src/test/resources/PCCCompilerTest.properties
- copied unchanged from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCCompilerTest.properties
maven/components/trunk/maven-model-converter/src/test/resources/PCCJarTest.properties
- copied unchanged from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCJarTest.properties
maven/components/trunk/maven-model-converter/src/test/resources/PCCJavadocTest1.properties
- copied unchanged from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCJavadocTest1.properties
maven/components/trunk/maven-model-converter/src/test/resources/PCCJavadocTest2.properties
- copied unchanged from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCJavadocTest2.properties
maven/components/trunk/maven-model-converter/src/test/resources/PCCJavadocTest3.properties
- copied unchanged from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCJavadocTest3.properties
maven/components/trunk/maven-model-converter/src/test/resources/PCCPmdTest.properties
- copied unchanged from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCPmdTest.properties
maven/components/trunk/maven-model-converter/src/test/resources/PCCSureFireTest1.properties
- copied unchanged from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCSureFireTest1.properties
maven/components/trunk/maven-model-converter/src/test/resources/PCCSureFireTest2.properties
- copied unchanged from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCSureFireTest2.properties
maven/components/trunk/maven-model-converter/src/test/resources/PCCSureFireTest3.properties
- copied unchanged from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCSureFireTest3.properties
maven/components/trunk/maven-model-converter/src/test/resources/PCCTaglistTest.properties
- copied unchanged from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCTaglistTest.properties
maven/components/trunk/maven-model-converter/src/test/resources/PCCWarTest1.properties
- copied unchanged from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCWarTest1.properties
maven/components/trunk/maven-model-converter/src/test/resources/PCCWarTest2.properties
- copied unchanged from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCWarTest2.properties
maven/components/trunk/maven-model-converter/src/test/resources/PCCWarTest3.properties
- copied unchanged from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCWarTest3.properties
Removed:
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/ModelUtils.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/AbstractPluginConfigurationConverter.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCChangelog.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCChanges.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCCheckstyle.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCCompiler.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCJar.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCJavadoc.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCMultiproject.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCPmd.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCSurefire.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCTaglist.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCWar.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PluginConfigurationConverter.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PropertyUtils.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/AbstractPluginRelocator.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/AbstractSourceForgePluginRelocator.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/CoberturaPluginRelocator.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/DefaultPluginRelocatorManager.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/DeveloperActivityPluginRelocator.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/FaqPluginRelocator.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/FileActivityPluginRelocator.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/FindbugsPluginRelocator.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/JdependPluginRelocator.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/JdiffPluginRelocator.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/JunitReportPluginRelocator.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/LicenseRelocator.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/NoSuchPluginRelocatorException.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/PluginRelocator.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/PluginRelocatorManager.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/SimianPluginRelocator.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/TasklistPluginRelocator.java
maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/XdocPluginRelocator.java
maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/AbstractPCCTest.java
maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCChangelogTest.java
maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCChangesTest.java
maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCCheckstyleTest.java
maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCCompilerTest.java
maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCJarTest.java
maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCJavadocTest.java
maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCPmdTest.java
maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCSurefireTest.java
maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCTaglistTest.java
maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PCCWarTest.java
maven/sandbox/plugins/maven-maven1-plugin/src/test/java/org/apache/maven/maven1converter/plugins/PropertyUtilsTest.java
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCChangelogTest1.properties
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCChangelogTest2.properties
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCChangelogTest3.properties
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCChangesTest.properties
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCCheckstyleTest1.properties
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCCheckstyleTest2.properties
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCCheckstyleTest3.properties
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCCompilerTest.properties
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCJarTest.properties
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCJavadocTest1.properties
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCJavadocTest2.properties
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCJavadocTest3.properties
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCPmdTest.properties
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCSureFireTest1.properties
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCSureFireTest2.properties
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCSureFireTest3.properties
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCTaglistTest.properties
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCWarTest1.properties
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCWarTest2.properties
maven/sandbox/plugins/maven-maven1-plugin/src/test/resources/PCCWarTest3.properties
Modified:
maven/components/trunk/maven-model-converter/pom.xml
Modified: maven/components/trunk/maven-model-converter/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/pom.xml?rev=423493&r1=423492&r2=423493&view=diff
==============================================================================
--- maven/components/trunk/maven-model-converter/pom.xml (original)
+++ maven/components/trunk/maven-model-converter/pom.xml Wed Jul 19 08:30:31 2006
@@ -45,7 +45,11 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.4</version>
</dependency>
</dependencies>
</project>
Added: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/Maven1Converter.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/Maven1Converter.java?rev=423493&view=auto
==============================================================================
--- maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/Maven1Converter.java (added)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/Maven1Converter.java Wed Jul 19 08:30:31 2006
@@ -0,0 +1,303 @@
+package org.apache.maven.model.converter;
+
+/*
+ * Copyright 2001-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.model.Model;
+import org.apache.maven.model.converter.plugins.PCCChangelog;
+import org.apache.maven.model.converter.plugins.PCCChanges;
+import org.apache.maven.model.converter.plugins.PCCCheckstyle;
+import org.apache.maven.model.converter.plugins.PCCCompiler;
+import org.apache.maven.model.converter.plugins.PCCJar;
+import org.apache.maven.model.converter.plugins.PCCJavadoc;
+import org.apache.maven.model.converter.plugins.PCCMultiproject;
+import org.apache.maven.model.converter.plugins.PCCPmd;
+import org.apache.maven.model.converter.plugins.PCCSurefire;
+import org.apache.maven.model.converter.plugins.PCCTaglist;
+import org.apache.maven.model.converter.plugins.PCCWar;
+import org.apache.maven.model.converter.plugins.PluginConfigurationConverter;
+import org.apache.maven.model.converter.relocators.PluginRelocator;
+import org.apache.maven.model.converter.relocators.PluginRelocatorManager;
+import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
+import org.apache.maven.model.v3_0_0.io.xpp3.MavenXpp3Reader;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.util.IOUtil;
+import org.dom4j.Document;
+import org.dom4j.Element;
+import org.dom4j.io.SAXReader;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Writer;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Properties;
+
+/**
+ * Converts a Maven 1 project.xml (v3 pom) to a Maven 2 pom.xml (v4 pom).
+ *
+ * @author Fabrizio Giustina
+ * @author Dennis Lundberg
+ * @version $Id$
+ */
+public class Maven1Converter
+ extends AbstractLogEnabled
+{
+ private File basedir;
+
+ /**
+ * Available converters for specific plugin configurations
+ */
+ private PluginConfigurationConverter[] converters = new PluginConfigurationConverter[]{new PCCChangelog(),
+ new PCCChanges(), new PCCCheckstyle(), new PCCCompiler(), new PCCJar(), new PCCJavadoc(), new PCCMultiproject(),
+ new PCCPmd(), new PCCSurefire(), new PCCTaglist(), new PCCWar()};
+
+ /**
+ * Plexus component that manages plugin relocators
+ *
+ * @component
+ */
+ private PluginRelocatorManager pluginRelocatorManager;
+
+ public void execute()
+ throws ProjectConverterException
+ {
+ File projectxml = new File( basedir, "project.xml" );
+
+ if ( !projectxml.exists() )
+ {
+ throw new ProjectConverterException( "Missing project.xml in " + basedir.getAbsolutePath() );
+ }
+
+ PomV3ToV4Translator translator = new PomV3ToV4Translator();
+
+ org.apache.maven.model.v3_0_0.Model v3Model;
+ try
+ {
+ v3Model = loadV3Pom( projectxml );
+ }
+ catch ( Exception e )
+ {
+ throw new ProjectConverterException( "Exception caught while loading project.xml. " + e.getMessage(), e );
+ }
+
+ Model v4Model;
+ try
+ {
+ v4Model = translator.translate( v3Model );
+ removeDistributionManagementStatus( v4Model );
+ }
+ catch ( Exception e )
+ {
+ throw new ProjectConverterException( "Exception caught while converting project.xml. " + e.getMessage(),
+ e );
+ }
+
+ Properties properties = new Properties();
+
+ if ( v3Model.getExtend() != null )
+ {
+ loadProperties( properties, new File( new File( basedir, v3Model.getExtend() ).getParentFile(),
+ "project.properties" ) );
+ }
+
+ loadProperties( properties, new File( basedir, "project.properties" ) );
+
+ for ( int j = 0; j < converters.length; j++ )
+ {
+ converters[j].convertConfiguration( v4Model, v3Model, properties );
+ }
+
+ // @todo Should this be run before or after the configuration converters?
+ Collection pluginRelocators = pluginRelocatorManager.getPluginRelocators();
+ getLogger().info( "There are " + pluginRelocators.size() + " plugin relocators available" );
+ PluginRelocator pluginRelocator;
+ Iterator iterator = pluginRelocators.iterator();
+ while ( iterator.hasNext() )
+ {
+ pluginRelocator = (PluginRelocator) iterator.next();
+ pluginRelocator.relocate( v4Model );
+ }
+
+ writeV4Pom( v4Model );
+ }
+
+ private boolean isEmpty( String value )
+ {
+ return value == null || value.trim().length() == 0;
+ }
+
+ private void loadProperties( Properties properties, File propertiesFile )
+ {
+ if ( propertiesFile.exists() )
+ {
+ InputStream is = null;
+ try
+ {
+ is = new FileInputStream( propertiesFile );
+ properties.load( is );
+ }
+ catch ( IOException e )
+ {
+ getLogger().warn( "Unable to read " + propertiesFile.getAbsolutePath() + ", ignoring." );
+ }
+ finally
+ {
+ IOUtil.close( is );
+ }
+ }
+ }
+
+ private org.apache.maven.model.v3_0_0.Model loadV3Pom( File inputFile )
+ throws Exception
+ {
+ MavenXpp3Reader v3Reader = new MavenXpp3Reader();
+
+ org.apache.maven.model.v3_0_0.Model model;
+
+ model = v3Reader.read( new FileReader( inputFile ) );
+
+ SAXReader r = new SAXReader();
+
+ Document d = r.read( new FileReader( inputFile ) );
+
+ Element root = d.getRootElement();
+
+ Element idElement = root.element( "id" );
+
+ String id = null;
+
+ if ( idElement != null )
+ {
+ id = idElement.getText();
+ }
+ // String id = model.getId();
+
+ String groupId = model.getGroupId();
+
+ String artifactId = model.getArtifactId();
+
+ if ( !isEmpty( id ) )
+ {
+ int i = id.indexOf( "+" );
+
+ int j = id.indexOf( ":" );
+
+ if ( i > 0 )
+ {
+ model.setGroupId( id.substring( 0, i ) );
+
+ model.setArtifactId( id.replace( '+', '-' ) );
+ }
+ else if ( j > 0 )
+ {
+ model.setGroupId( id.substring( 0, j ) );
+
+ model.setArtifactId( id.substring( j + 1 ) );
+ }
+ else
+ {
+ model.setGroupId( id );
+
+ model.setArtifactId( id );
+ }
+
+ if ( !isEmpty( groupId ) )
+ {
+ getLogger().warn( "Both <id> and <groupId> is set, using <groupId>." );
+
+ model.setGroupId( groupId );
+ }
+
+ if ( !isEmpty( artifactId ) )
+ {
+ getLogger().warn( "Both <id> and <artifactId> is set, using <artifactId>." );
+
+ model.setArtifactId( artifactId );
+ }
+ }
+
+ return model;
+ }
+
+ /**
+ * The status element of the distributionManagement section must not be
+ * set in local projects. This method removes that element from the model.
+ */
+ private void removeDistributionManagementStatus( Model v4Model )
+ {
+ if ( v4Model.getDistributionManagement() != null )
+ {
+ if ( "converted".equals( v4Model.getDistributionManagement().getStatus() ) )
+ {
+ v4Model.getDistributionManagement().setStatus( null );
+ }
+ }
+ }
+
+ /**
+ * Write the pom to <code>${basedir}/pom.xml</code>. If the file exists it
+ * will be overwritten.
+ *
+ * @param v4Model
+ * @throws ProjectConverterException
+ */
+ private void writeV4Pom( Model v4Model )
+ throws ProjectConverterException
+ {
+ File pomxml = new File( basedir, "pom.xml" );
+
+ if ( pomxml.exists() )
+ {
+ getLogger().warn( "pom.xml in " + basedir.getAbsolutePath() + " already exists, overwriting" );
+ }
+
+ MavenXpp3Writer v4Writer = new MavenXpp3Writer();
+
+ // write the new pom.xml
+ getLogger().info( "Writing new pom to: " + pomxml.getAbsolutePath() );
+
+ Writer output = null;
+ try
+ {
+ output = new FileWriter( pomxml );
+ v4Writer.write( output, v4Model );
+ output.close();
+ }
+ catch ( IOException e )
+ {
+ throw new ProjectConverterException( "Unable to write pom.xml. " + e.getMessage(), e );
+ }
+ finally
+ {
+ IOUtil.close( output );
+ }
+ }
+
+ public File getBasedir()
+ {
+ return basedir;
+ }
+
+ public void setBasedir( File basedir )
+ {
+ this.basedir = basedir;
+ }
+}
Propchange: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/Maven1Converter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/Maven1Converter.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ModelUtils.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/ModelUtils.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ModelUtils.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ModelUtils.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/ModelUtils.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/ModelUtils.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ModelUtils.java Wed Jul 19 08:30:31 2006
@@ -1,4 +1,4 @@
-package org.apache.maven.maven1converter;
+package org.apache.maven.model.converter;
import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
Added: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ProjectConverterException.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ProjectConverterException.java?rev=423493&view=auto
==============================================================================
--- maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ProjectConverterException.java (added)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ProjectConverterException.java Wed Jul 19 08:30:31 2006
@@ -0,0 +1,19 @@
+package org.apache.maven.model.converter;
+
+/**
+ * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @version $Id$
+ */
+public class ProjectConverterException
+ extends Exception
+{
+ public ProjectConverterException( String message )
+ {
+ super( message );
+ }
+
+ public ProjectConverterException( String message, Throwable throwable )
+ {
+ super( message, throwable );
+ }
+}
Propchange: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ProjectConverterException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ProjectConverterException.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/AbstractPluginConfigurationConverter.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/AbstractPluginConfigurationConverter.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/AbstractPluginConfigurationConverter.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/AbstractPluginConfigurationConverter.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/AbstractPluginConfigurationConverter.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/AbstractPluginConfigurationConverter.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/AbstractPluginConfigurationConverter.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 2001-2006 The Apache Software Foundation.
@@ -21,8 +21,8 @@
import org.apache.maven.model.Plugin;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.Reporting;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.maven1converter.ModelUtils;
+import org.apache.maven.model.converter.ModelUtils;
+import org.apache.maven.model.converter.ProjectConverterException;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.util.Properties;
@@ -53,11 +53,9 @@
* @param projectProperties The M1 properties
* @param mavenOneProperty The name of the Maven 1 property to convert
* @param mavenTwoElement The name of the Maven 2 configuration element
- * @throws MojoExecutionException if an element can't be created
*/
protected void addConfigurationChild( Xpp3Dom configuration, Properties projectProperties, String mavenOneProperty,
String mavenTwoElement )
- throws MojoExecutionException
{
String value = projectProperties.getProperty( mavenOneProperty );
addConfigurationChild( configuration, mavenTwoElement, value );
@@ -69,10 +67,8 @@
* @param configuration The configuration to add the element to
* @param mavenTwoElement The name of the Maven 2 configuration element
* @param value Set the value of the element to this
- * @throws MojoExecutionException if an element can't be created
*/
protected void addConfigurationChild( Xpp3Dom configuration, String mavenTwoElement, String value )
- throws MojoExecutionException
{
if ( value != null )
{
@@ -84,7 +80,7 @@
public void convertConfiguration( Model v4Model, org.apache.maven.model.v3_0_0.Model v3Model,
Properties projectProperties )
- throws MojoExecutionException
+ throws ProjectConverterException
{
boolean addPlugin = false;
@@ -143,5 +139,5 @@
protected abstract void buildConfiguration( Xpp3Dom configuration, org.apache.maven.model.v3_0_0.Model v3Model,
Properties projectProperties )
- throws MojoExecutionException;
+ throws ProjectConverterException;
}
Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChangelog.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCChangelog.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChangelog.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChangelog.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCChangelog.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCChangelog.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChangelog.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.
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.model.converter.ProjectConverterException;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.util.Properties;
@@ -27,7 +27,8 @@
* @author Dennis Lundberg
* @version $Id: PCCChangelog.java 409264 2006-05-24 23:13:13 +0000 (on, 24 maj 2006) carlos $
*/
-public class PCCChangelog extends AbstractPluginConfigurationConverter
+public class PCCChangelog
+ extends AbstractPluginConfigurationConverter
{
/**
* @see AbstractPluginConfigurationConverter#getArtifactId()
@@ -44,7 +45,7 @@
protected void buildConfiguration( Xpp3Dom configuration, org.apache.maven.model.v3_0_0.Model v3Model,
Properties projectProperties )
- throws MojoExecutionException
+ throws ProjectConverterException
{
addConfigurationChild( configuration, projectProperties, "maven.changelog.commentFormat", "commentFormat" );
Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChanges.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCChanges.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChanges.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChanges.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCChanges.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCChanges.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChanges.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.
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.model.converter.ProjectConverterException;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.util.Properties;
@@ -27,10 +27,11 @@
* @author Dennis Lundberg
* @version $Id: PCCChanges.java 409264 2006-05-24 23:13:13 +0000 (on, 24 maj 2006) carlos $
*/
-public class PCCChanges extends AbstractPluginConfigurationConverter
+public class PCCChanges
+ extends AbstractPluginConfigurationConverter
{
/**
- * @see org.apache.maven.maven1converter.plugins.AbstractPluginConfigurationConverter#getArtifactId()
+ * @see org.apache.maven.model.converter.plugins.AbstractPluginConfigurationConverter#getArtifactId()
*/
public String getArtifactId()
{
@@ -44,7 +45,7 @@
protected void buildConfiguration( Xpp3Dom configuration, org.apache.maven.model.v3_0_0.Model v3Model,
Properties projectProperties )
- throws MojoExecutionException
+ throws ProjectConverterException
{
addConfigurationChild( configuration, projectProperties, "maven.changes.issue.template", "link_template" );
}
Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCCheckstyle.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCCheckstyle.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCCheckstyle.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCCheckstyle.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCCheckstyle.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCCheckstyle.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCCheckstyle.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.
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.model.converter.ProjectConverterException;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.util.Properties;
@@ -27,7 +27,8 @@
* @author Dennis Lundberg
* @version $Id: PCCCheckstyle.java 409264 2006-05-24 23:13:13 +0000 (on, 24 maj 2006) carlos $
*/
-public class PCCCheckstyle extends AbstractPluginConfigurationConverter
+public class PCCCheckstyle
+ extends AbstractPluginConfigurationConverter
{
/**
* @see AbstractPluginConfigurationConverter#getArtifactId()
@@ -44,7 +45,7 @@
protected void buildConfiguration( Xpp3Dom configuration, org.apache.maven.model.v3_0_0.Model v3Model,
Properties projectProperties )
- throws MojoExecutionException
+ throws ProjectConverterException
{
addConfigurationChild( configuration, projectProperties, "maven.checkstyle.cache.file", "cacheFile" );
Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCCompiler.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCCompiler.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCCompiler.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCCompiler.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCCompiler.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCCompiler.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCCompiler.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 2001-2006 The Apache Software Foundation.
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-import java.util.Properties;
-
-import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.model.converter.ProjectConverterException;
import org.codehaus.plexus.util.xml.Xpp3Dom;
+import java.util.Properties;
+
/**
* @author Fabrizio Giustina
* @author Dennis Lundberg
@@ -30,7 +30,7 @@
extends AbstractPluginConfigurationConverter
{
/**
- * @see org.apache.maven.maven1converter.plugins.AbstractPluginConfigurationConverter#getArtifactId()
+ * @see org.apache.maven.model.converter.plugins.AbstractPluginConfigurationConverter#getArtifactId()
*/
public String getArtifactId()
{
@@ -44,19 +44,18 @@
protected void addOnOffConfigurationChild( Xpp3Dom configuration, Properties projectProperties,
String mavenOneProperty, String mavenTwoElement )
- throws MojoExecutionException
+ throws ProjectConverterException
{
String value = projectProperties.getProperty( mavenOneProperty );
if ( value != null )
{
- addConfigurationChild( configuration, mavenTwoElement,
- PropertyUtils.convertOnOffToBoolean( value ) );
+ addConfigurationChild( configuration, mavenTwoElement, PropertyUtils.convertOnOffToBoolean( value ) );
}
}
protected void buildConfiguration( Xpp3Dom configuration, org.apache.maven.model.v3_0_0.Model v3Model,
Properties projectProperties )
- throws MojoExecutionException
+ throws ProjectConverterException
{
addOnOffConfigurationChild( configuration, projectProperties, "maven.compile.debug", "debug" );
Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJar.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCJar.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJar.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJar.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCJar.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCJar.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJar.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.
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.model.converter.ProjectConverterException;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.util.Properties;
@@ -28,10 +28,11 @@
* @author Dennis Lundberg
* @version $Id: PCCJar.java 409264 2006-05-24 23:13:13 +0000 (on, 24 maj 2006) carlos $
*/
-public class PCCJar extends AbstractPluginConfigurationConverter
+public class PCCJar
+ extends AbstractPluginConfigurationConverter
{
/**
- * @see org.apache.maven.maven1converter.plugins.AbstractPluginConfigurationConverter#getArtifactId()
+ * @see org.apache.maven.model.converter.plugins.AbstractPluginConfigurationConverter#getArtifactId()
*/
public String getArtifactId()
{
@@ -45,7 +46,7 @@
protected void buildConfiguration( Xpp3Dom configuration, org.apache.maven.model.v3_0_0.Model v3Model,
Properties projectProperties )
- throws MojoExecutionException
+ throws ProjectConverterException
{
Xpp3Dom archive = new Xpp3Dom( "archive" );
addConfigurationChild( archive, projectProperties, "maven.jar.compress", "compress" );
Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCJavadoc.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCJavadoc.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCJavadoc.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.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.
@@ -16,8 +16,8 @@
* limitations under the License.
*/
+import org.apache.maven.model.converter.ProjectConverterException;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.apache.maven.plugin.MojoExecutionException;
import java.util.Properties;
import java.util.StringTokenizer;
@@ -28,10 +28,11 @@
* @author Dennis Lundberg
* @version $Id: PCCJavadoc.java 409264 2006-05-24 23:13:13 +0000 (on, 24 maj 2006) carlos $
*/
-public class PCCJavadoc extends AbstractPluginConfigurationConverter
+public class PCCJavadoc
+ extends AbstractPluginConfigurationConverter
{
/**
- * @see org.apache.maven.maven1converter.plugins.AbstractPluginConfigurationConverter#getArtifactId()
+ * @see org.apache.maven.model.converter.plugins.AbstractPluginConfigurationConverter#getArtifactId()
*/
public String getArtifactId()
{
@@ -45,7 +46,7 @@
protected void buildConfiguration( Xpp3Dom configuration, org.apache.maven.model.v3_0_0.Model v3Model,
Properties projectProperties )
- throws MojoExecutionException
+ throws ProjectConverterException
{
addConfigurationChild( configuration, projectProperties, "maven.javadoc.additionalparam", "additionalparam" );
@@ -153,7 +154,8 @@
addConfigurationChild( configuration, projectProperties, "maven.javadoc.windowtitle", "windowtitle" );
// Only add these if we have any other configuration for the javadoc-plugin
- if(configuration.getChildCount() > 0) {
+ if ( configuration.getChildCount() > 0 )
+ {
// The Maven 1 plugin uses the same outputencoding as the generated documentation.
addConfigurationChild( configuration, projectProperties, "maven.docs.outputencoding", "docencoding" );
Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCMultiproject.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCMultiproject.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCMultiproject.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCMultiproject.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCMultiproject.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCMultiproject.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCMultiproject.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 2001-2006 The Apache Software Foundation.
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import java.util.Properties;
-
import org.apache.maven.model.Model;
-import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.model.converter.ProjectConverterException;
+
+import java.util.Properties;
/**
* @author Fabrizio Giustina
@@ -30,11 +30,11 @@
{
/**
- * @see org.apache.maven.maven1converter.plugins.PluginConfigurationConverter#convertConfiguration(org.apache.maven.model.Model, org.apache.maven.model.v3_0_0.Model, java.util.Properties)
+ * @see org.apache.maven.model.converter.plugins.PluginConfigurationConverter#convertConfiguration(org.apache.maven.model.Model, org.apache.maven.model.v3_0_0.Model, java.util.Properties)
*/
public void convertConfiguration( Model v4Model, org.apache.maven.model.v3_0_0.Model v3Model,
- Properties projectProperties )
- throws MojoExecutionException
+ Properties projectProperties )
+ throws ProjectConverterException
{
String projectType = projectProperties.getProperty( "maven.multiproject.type" );
Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCPmd.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCPmd.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCPmd.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCPmd.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCPmd.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCPmd.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCPmd.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.
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.model.converter.ProjectConverterException;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.util.Properties;
@@ -28,7 +28,8 @@
* @author Dennis Lundberg
* @version $Id: PCCPmd.java 409264 2006-05-24 23:13:13 +0000 (on, 24 maj 2006) carlos $
*/
-public class PCCPmd extends AbstractPluginConfigurationConverter
+public class PCCPmd
+ extends AbstractPluginConfigurationConverter
{
/**
* @see AbstractPluginConfigurationConverter#getArtifactId()
@@ -45,7 +46,7 @@
protected void buildConfiguration( Xpp3Dom configuration, org.apache.maven.model.v3_0_0.Model v3Model,
Properties projectProperties )
- throws MojoExecutionException
+ throws ProjectConverterException
{
addConfigurationChild( configuration, projectProperties, "maven.pmd.excludes", "excludes" );
Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCSurefire.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCSurefire.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCSurefire.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCSurefire.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCSurefire.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCSurefire.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCSurefire.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 2001-2006 The Apache Software Foundation.
@@ -16,23 +16,24 @@
* limitations under the License.
*/
+import org.apache.maven.model.converter.ProjectConverterException;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+
import java.util.Iterator;
import java.util.List;
import java.util.Properties;
import java.util.StringTokenizer;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-
/**
* @author Fabrizio Giustina
* @author Dennis Lundberg
* @version $Id$
*/
-public class PCCSurefire extends AbstractPluginConfigurationConverter
+public class PCCSurefire
+ extends AbstractPluginConfigurationConverter
{
/**
- * @see org.apache.maven.maven1converter.plugins.AbstractPluginConfigurationConverter#getArtifactId()
+ * @see org.apache.maven.model.converter.plugins.AbstractPluginConfigurationConverter#getArtifactId()
*/
public String getArtifactId()
{
@@ -46,7 +47,7 @@
protected void buildConfiguration( Xpp3Dom configuration, org.apache.maven.model.v3_0_0.Model v3Model,
Properties projectProperties )
- throws MojoExecutionException
+ throws ProjectConverterException
{
addConfigurationChild( configuration, projectProperties, "maven.junit.jvmargs", "argLine" );
Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCTaglist.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCTaglist.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCTaglist.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCTaglist.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCTaglist.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCTaglist.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCTaglist.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.
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.model.converter.ProjectConverterException;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.util.Properties;
@@ -27,10 +27,11 @@
* @author Dennis Lundberg
* @version $Id: PCCTaglist.java 409264 2006-05-24 23:13:13 +0000 (on, 24 maj 2006) carlos $
*/
-public class PCCTaglist extends AbstractPluginConfigurationConverter
+public class PCCTaglist
+ extends AbstractPluginConfigurationConverter
{
/**
- * @see org.apache.maven.maven1converter.plugins.AbstractPluginConfigurationConverter#getArtifactId()
+ * @see org.apache.maven.model.converter.plugins.AbstractPluginConfigurationConverter#getArtifactId()
*/
public String getArtifactId()
{
@@ -44,7 +45,7 @@
protected void buildConfiguration( Xpp3Dom configuration, org.apache.maven.model.v3_0_0.Model v3Model,
Properties projectProperties )
- throws MojoExecutionException
+ throws ProjectConverterException
{
addConfigurationChild( configuration, projectProperties, "maven.tasklist.taskTag", "tags" );
}
Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCWar.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCWar.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCWar.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCWar.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCWar.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PCCWar.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCWar.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 2001-2006 The Apache Software Foundation.
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.model.converter.ProjectConverterException;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -27,10 +27,11 @@
* @author Dennis Lundberg
* @version $Id$
*/
-public class PCCWar extends AbstractPluginConfigurationConverter
+public class PCCWar
+ extends AbstractPluginConfigurationConverter
{
/**
- * @see org.apache.maven.maven1converter.plugins.AbstractPluginConfigurationConverter#getArtifactId()
+ * @see org.apache.maven.model.converter.plugins.AbstractPluginConfigurationConverter#getArtifactId()
*/
public String getArtifactId()
{
@@ -44,7 +45,7 @@
protected void buildConfiguration( Xpp3Dom configuration, org.apache.maven.model.v3_0_0.Model v3Model,
Properties projectProperties )
- throws MojoExecutionException
+ throws ProjectConverterException
{
String warSourceDirectory = projectProperties.getProperty( "maven.war.src" );
addConfigurationChild( configuration, "warSourceDirectory",
Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PluginConfigurationConverter.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PluginConfigurationConverter.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PluginConfigurationConverter.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PluginConfigurationConverter.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PluginConfigurationConverter.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PluginConfigurationConverter.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PluginConfigurationConverter.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 2001-2006 The Apache Software Foundation.
@@ -19,7 +19,7 @@
import java.util.Properties;
import org.apache.maven.model.Model;
-import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.model.converter.ProjectConverterException;
/**
* A plugin configuration converter reads properties from a v3 pom or project.properties and add them to the v4 pom.
@@ -29,5 +29,5 @@
public interface PluginConfigurationConverter
{
void convertConfiguration( Model v4Model, org.apache.maven.model.v3_0_0.Model v3Model, Properties projectProperties )
- throws MojoExecutionException;
+ throws ProjectConverterException;
}
Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PropertyUtils.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PropertyUtils.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PropertyUtils.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PropertyUtils.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PropertyUtils.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/plugins/PropertyUtils.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PropertyUtils.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/main/java/org/apache/maven/model/converter/relocators/AbstractPluginRelocator.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/AbstractPluginRelocator.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/AbstractPluginRelocator.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/AbstractPluginRelocator.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/AbstractPluginRelocator.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/AbstractPluginRelocator.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/AbstractPluginRelocator.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.
@@ -16,11 +16,10 @@
* limitations under the License.
*/
-import org.apache.maven.maven1converter.ModelUtils;
import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.model.converter.ModelUtils;
import org.codehaus.plexus.logging.AbstractLogEnabled;
/**
@@ -29,7 +28,9 @@
* @author Dennis Lundberg
* @version $Id: PluginRelocator.java 409264 2006-05-24 23:13:13 +0000 (on, 24 maj 2006) dennisl $
*/
-public abstract class AbstractPluginRelocator extends AbstractLogEnabled implements PluginRelocator
+public abstract class AbstractPluginRelocator
+ extends AbstractLogEnabled
+ implements PluginRelocator
{
/**
* If there is no replacement for this plugin, you can have the plugin
@@ -79,7 +80,6 @@
* {@inheritDoc}
*/
public void relocate( Model v4Model )
- throws MojoExecutionException
{
// Relocate build plugins
Plugin oldBuildPlugin = ModelUtils.findBuildPlugin( v4Model, getOldGroupId(), getOldArtifactId() );
Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/AbstractSourceForgePluginRelocator.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/AbstractSourceForgePluginRelocator.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/AbstractSourceForgePluginRelocator.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/AbstractSourceForgePluginRelocator.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/AbstractSourceForgePluginRelocator.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/AbstractSourceForgePluginRelocator.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/AbstractSourceForgePluginRelocator.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.
@@ -25,7 +25,7 @@
public abstract class AbstractSourceForgePluginRelocator extends AbstractPluginRelocator
{
/**
- * @see org.apache.maven.maven1converter.relocators.AbstractPluginRelocator#getOldGroupId()
+ * @see org.apache.maven.model.converter.relocators.AbstractPluginRelocator#getOldGroupId()
*/
public String getOldGroupId()
{
Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/CoberturaPluginRelocator.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/CoberturaPluginRelocator.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/CoberturaPluginRelocator.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/CoberturaPluginRelocator.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/CoberturaPluginRelocator.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/CoberturaPluginRelocator.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/CoberturaPluginRelocator.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: CoberturaPluginRelocator.java 411318 2006-06-02 22:34:35 +0000 (fr, 02 jun 2006) dennisl $
- * @plexus.component role="org.apache.maven.maven1converter.relocators.PluginRelocator"
+ * @plexus.component role="org.apache.maven.model.converter.relocators.PluginRelocator"
* role-hint="cobertura"
*/
public class CoberturaPluginRelocator extends AbstractSourceForgePluginRelocator
Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/DefaultPluginRelocatorManager.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/DefaultPluginRelocatorManager.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/DefaultPluginRelocatorManager.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/DefaultPluginRelocatorManager.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/DefaultPluginRelocatorManager.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/DefaultPluginRelocatorManager.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/DefaultPluginRelocatorManager.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.
@@ -26,12 +26,12 @@
*
* @author Dennis Lundberg
* @version $Id: DefaultPluginRelocatorManager.java 3420 2006-06-23 20:23:59Z dennisl $
- * @plexus.component role="org.apache.maven.maven1converter.relocators.PluginRelocatorManager"
+ * @plexus.component role="org.apache.maven.model.converter.relocators.PluginRelocatorManager"
*/
public class DefaultPluginRelocatorManager extends AbstractLogEnabled implements PluginRelocatorManager
{
/**
- * @plexus.requirement role="org.apache.maven.maven1converter.relocators.PluginRelocator"
+ * @plexus.requirement role="org.apache.maven.model.converter.relocators.PluginRelocator"
*/
private Map pluginRelocators;
Copied: maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/DeveloperActivityPluginRelocator.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/DeveloperActivityPluginRelocator.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/DeveloperActivityPluginRelocator.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/DeveloperActivityPluginRelocator.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/DeveloperActivityPluginRelocator.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/DeveloperActivityPluginRelocator.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/DeveloperActivityPluginRelocator.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: DeveloperActivityPluginRelocator.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="developer-activity"
*/
public class DeveloperActivityPluginRelocator 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/FaqPluginRelocator.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/FaqPluginRelocator.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/FaqPluginRelocator.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/FaqPluginRelocator.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/FaqPluginRelocator.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/FaqPluginRelocator.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/FaqPluginRelocator.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: FaqPluginRelocator.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="faq"
*/
public class FaqPluginRelocator 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/FileActivityPluginRelocator.java (from r420108, maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/FileActivityPluginRelocator.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/FileActivityPluginRelocator.java?p2=maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/FileActivityPluginRelocator.java&p1=maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/FileActivityPluginRelocator.java&r1=420108&r2=423493&rev=423493&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-maven1-plugin/src/main/java/org/apache/maven/maven1converter/relocators/FileActivityPluginRelocator.java (original)
+++ maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/FileActivityPluginRelocator.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: DeveloperActivityPluginRelocator.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="file-activity"
*/
public class FileActivityPluginRelocator extends AbstractPluginRelocator