You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by jd...@apache.org on 2005/02/20 17:25:22 UTC
cvs commit: maven-components/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java JavaMojoDescriptorExtractor.java
jdcasey 2005/02/20 08:25:22
Modified: maven-mboot2/src/main/java MBoot.java
maven-plugins/maven-plugin-plugin pom.xml
maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin
BeanGeneratorMojo.java AbstractGeneratorMojo.java
JellyGeneratorMojo.java
maven-plugin/src/main/java/org/apache/maven/plugin/descriptor
MojoDescriptor.java PluginDescriptorBuilder.java
maven-core/src/site/apt/scripting-support
marmalade-support.apt
maven-plugin-tools pom.xml
Added: maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade
MarmaladeMojoExecutionDirectives.java
MarmaladeMojoFailureResponse.java
MarmaladeMojo.java
maven-plugin-tools/maven-plugin-tools-api/src/test/resources/META-INF/plexus
scannerTestComponents.xml
maven-plugin-tools/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/java
JavaMojoDescriptorExtractorTest.java
maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin
DescriptorGeneratorMojo.java
maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util
TestUtils.java PluginUtilsTest.java
maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner
DefaultMojoScannerTest.java TestExtractor.java
maven-plugin-tools/maven-plugin-tools-api/src/test/resources
test.txt testExcludes.txt
maven-plugin-tools/maven-plugin-tools-pluggy pom.xml
maven-script pom.xml
maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner
MojoScanner.java DefaultMojoScanner.java
maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator
PluginXdocGeneratorTest.java
PluginDescriptorGeneratorTest.java
AbstractGeneratorTestCase.java
maven-plugins/maven-plugin-plugin/src/site/apt
multiple-language-support.apt
maven-plugin-tools/maven-plugin-tools-java/src/main/resources/META-INF/plexus
components.xml
maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator
BeanGenerator.java PluginDescriptorGenerator.java
PluginXdocGenerator.java Generator.java
maven-plugin-tools/maven-plugin-tools-api pom.xml
maven-script/maven-script-marmalade/src/main/resources/META-INF/marmalade
mojo.def
maven-plugin-tools/maven-plugin-tools-java pom.xml
maven-plugin-tools/maven-plugin-tools-java/src/test/resources
dir-flag.txt
maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor
InvalidParameterException.java
MojoDescriptorExtractor.java
maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util
PluginUtils.java
maven-plugin-tools/maven-plugin-tools-marmalade/src/main/java/org/apache/maven/tools/plugin/extractor/marmalade
MarmaladeMojoDescriptorExtractor.java
maven-plugin-tools/maven-plugin-tools-marmalade pom.xml
maven-plugin-tools/maven-plugin-tools-pluggy/src/main/java/org/apache/maven/tools/plugin/pluggy
Main.java
maven-plugin-tools/maven-plugin-tools-java/src .cvsignore
maven-plugin-tools/maven-plugin-tools-java/src/test/resources/source
JavaExtractorTestTwo.java JavaExtractorTestOne.java
maven-script/maven-script-marmalade pom.xml
maven-plugin-tools/maven-plugin-tools-api/src/main/resources/META-INF/plexus
components.xml
maven-plugin-tools/maven-plugin-tools-marmalade/src/main/resources/META-INF/plexus
components.xml
maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/jelly
JellyHarnessGenerator.java
maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java
JavaMojoDescriptorExtractor.java
Removed: maven-plugin-tools/src/test/resources/source
IdeaMojoTwo.java IdeaMojoOne.java pom.xml
maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator
BeanGenerator.java InvalidParameterException.java
Main.java AbstractGenerator.java
PluginDescriptorGenerator.java Generator.java
PluginXdocGenerator.java
maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin
DescriptorGenerator.java
maven-plugin-loaders/maven-marmalade-loader/src/main/java/org/apache/maven/plugin/loader/marmalade/tags
DescriptionTag.java MojoDependencyTag.java
MojoPrereqsTag.java MojoParameterTag.java
DescriptionOwner.java MojoTag.java
MojoDescriptorTag.java MojoParametersTag.java
MojoDependenciesTag.java MojoTagLibrary.java
MojoPrereqTag.java
maven-plugin-loaders/maven-marmalade-loader/src/main/resources/META-INF/marmalade
mojo.def
maven-plugin-loaders/maven-marmalade-loader pom.xml
maven-plugin-tools/src .cvsignore
maven-plugin-tools/src/test/java/org/apache/maven/plugin/generator
PluginXdocGeneratorTest.java
AbstractGeneratorTestCase.java
PluginDescriptorGeneratorTest.java
maven-plugin-loaders/maven-marmalade-loader/src/main/java/org/apache/maven/plugin/loader/marmalade
MarmaladeScriptMojo.java
MarmaladePluginDiscoverer.java
maven-plugin-loaders/maven-marmalade-loader/src/test/java/org/apache/maven/plugin/loader/marmalade
MarmaladePluginDiscovererTest.java
maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/jelly
JellyHarnessGenerator.java
Log:
o Refactored mojo/plugin generation, extraction, etc. to accommodate multiple mojo languages.
o Tested with java mojos, mboot to verify nothing broken by refactor.
o TODO: Add marmalade support tests...currently only java-mojos are supported in mboot2, so this isn't going to interrupt things.
o TODO: Once marmalade support is tested, add to the list of artifacts built by mboot2.
Revision Changes Path
1.1 maven-components/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/MarmaladeMojoExecutionDirectives.java
http://cvs.apache.org/viewcvs/maven-components/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/MarmaladeMojoExecutionDirectives.java?rev=1.1
1.1 maven-components/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/MarmaladeMojoFailureResponse.java
http://cvs.apache.org/viewcvs/maven-components/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/MarmaladeMojoFailureResponse.java?rev=1.1
1.1 maven-components/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/MarmaladeMojo.java
http://cvs.apache.org/viewcvs/maven-components/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/MarmaladeMojo.java?rev=1.1
1.45 +48 -13 maven-components/maven-mboot2/src/main/java/MBoot.java
http://cvs.apache.org/viewcvs/maven-components/maven-mboot2/src/main/java/MBoot.java.diff?r1=1.44&r2=1.45
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/src/test/resources/META-INF/plexus/scannerTestComponents.xml
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/src/test/resources/META-INF/plexus/scannerTestComponents.xml?rev=1.1
1.6 +16 -3 maven-components/maven-plugins/maven-plugin-plugin/pom.xml
http://cvs.apache.org/viewcvs/maven-components/maven-plugins/maven-plugin-plugin/pom.xml.diff?r1=1.5&r2=1.6
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractorTest.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractorTest.java?rev=1.1
1.4 +17 -14 maven-components/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/BeanGeneratorMojo.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/BeanGeneratorMojo.java.diff?r1=1.3&r2=1.4
1.2 +12 -6 maven-components/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java.diff?r1=1.1&r2=1.2
1.6 +21 -17 maven-components/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/JellyGeneratorMojo.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/JellyGeneratorMojo.java.diff?r1=1.5&r2=1.6
1.1 maven-components/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/TestUtils.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/TestUtils.java?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/PluginUtilsTest.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/PluginUtilsTest.java?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/TestExtractor.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/TestExtractor.java?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/src/test/resources/test.txt
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/src/test/resources/test.txt?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/src/test/resources/testExcludes.txt
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/src/test/resources/testExcludes.txt?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml?rev=1.1
1.1 maven-components/maven-script/pom.xml
http://cvs.apache.org/viewcvs/maven-components/maven-script/pom.xml?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/MojoScanner.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/MojoScanner.java?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginXdocGeneratorTest.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginXdocGeneratorTest.java?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java?rev=1.1
1.1 maven-components/maven-plugins/maven-plugin-plugin/src/site/apt/multiple-language-support.apt
http://cvs.apache.org/viewcvs/maven-components/maven-plugins/maven-plugin-plugin/src/site/apt/multiple-language-support.apt?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-java/src/main/resources/META-INF/plexus/components.xml
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-java/src/main/resources/META-INF/plexus/components.xml?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/BeanGenerator.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/BeanGenerator.java?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/Generator.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/Generator.java?rev=1.1
1.4 +14 -0 maven-components/maven-plugin/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java.diff?r1=1.3&r2=1.4
1.5 +11 -4 maven-components/maven-plugin/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java.diff?r1=1.4&r2=1.5
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/pom.xml
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/pom.xml?rev=1.1
1.3 +39 -32 maven-components/maven-core/src/site/apt/scripting-support/marmalade-support.apt
http://cvs.apache.org/viewcvs/maven-components/maven-core/src/site/apt/scripting-support/marmalade-support.apt.diff?r1=1.2&r2=1.3
1.1 maven-components/maven-script/maven-script-marmalade/src/main/resources/META-INF/marmalade/mojo.def
http://cvs.apache.org/viewcvs/maven-components/maven-script/maven-script-marmalade/src/main/resources/META-INF/marmalade/mojo.def?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-java/pom.xml
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-java/pom.xml?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-java/src/test/resources/dir-flag.txt
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-java/src/test/resources/dir-flag.txt?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/InvalidParameterException.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/InvalidParameterException.java?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/MojoDescriptorExtractor.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/MojoDescriptorExtractor.java?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-marmalade/src/main/java/org/apache/maven/tools/plugin/extractor/marmalade/MarmaladeMojoDescriptorExtractor.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-marmalade/src/main/java/org/apache/maven/tools/plugin/extractor/marmalade/MarmaladeMojoDescriptorExtractor.java?rev=1.1
1.4 +7 -3 maven-components/maven-plugin-tools/pom.xml
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/pom.xml.diff?r1=1.3&r2=1.4
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-pluggy/src/main/java/org/apache/maven/tools/plugin/pluggy/Main.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-pluggy/src/main/java/org/apache/maven/tools/plugin/pluggy/Main.java?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-java/src/.cvsignore
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-java/src/.cvsignore?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-java/src/test/resources/source/JavaExtractorTestTwo.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-java/src/test/resources/source/JavaExtractorTestTwo.java?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-java/src/test/resources/source/JavaExtractorTestOne.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-java/src/test/resources/source/JavaExtractorTestOne.java?rev=1.1
1.1 maven-components/maven-script/maven-script-marmalade/pom.xml
http://cvs.apache.org/viewcvs/maven-components/maven-script/maven-script-marmalade/pom.xml?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/resources/META-INF/plexus/components.xml
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/resources/META-INF/plexus/components.xml?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-marmalade/src/main/resources/META-INF/plexus/components.xml
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-marmalade/src/main/resources/META-INF/plexus/components.xml?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/jelly/JellyHarnessGenerator.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/jelly/JellyHarnessGenerator.java?rev=1.1
1.1 maven-components/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
http://cvs.apache.org/viewcvs/maven-components/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java?rev=1.1