[maven-release-plugin] copy for tag maven-plugin-tools-3.4

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-3.4@1648955 13f79535-47bb-0310-9956-ffa450edef68
maven-plugin-tools-3.4
Herve Boutemy 2015-01-01 21:57:23 +00:00
commit 53ff5b83b6
71 changed files with 162 additions and 231 deletions

View File

@ -52,13 +52,13 @@ public @interface Mojo
/**
* the required dependency resolution scope.
* @return
* @return the required dependency resolution scope
*/
ResolutionScope requiresDependencyResolution() default ResolutionScope.NONE;
/**
* the required dependency collection scope.
* @return
* @return the required dependency collection scope
*/
ResolutionScope requiresDependencyCollection() default ResolutionScope.NONE;
@ -76,31 +76,31 @@ public @interface Mojo
/**
* does your mojo requires a project to be executed?
* @return
* @return requires a project
*/
boolean requiresProject() default true;
/**
* does your mojo requires a reporting context to be executed?
* @return
* @return requires a reporting context
*/
boolean requiresReports() default false;
/**
* if the Mojo uses the Maven project and its child modules.
* @return
* @return uses the Maven project and its child modules
*/
boolean aggregator() default false;
/**
* can this Mojo be invoked directly only?
* @return
* @return invoked directly only
*/
boolean requiresDirectInvocation() default false;
/**
* does this Mojo need to be online to be executed?
* @return
* @return need to be online
*/
boolean requiresOnline() default false;
@ -108,13 +108,13 @@ public @interface Mojo
/**
* own configurator class.
* @return
* @return own configurator class
*/
String configurator() default "";
/**
* is your mojo thread safe (since Maven 3.x)?
* @return
* @return is thread safe
*/
boolean threadSafe() default false;
}

View File

@ -26,7 +26,7 @@ import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.tools.plugin.annotations.FooMojo;
import org.apache.maven.tools.plugin.extractor.annotations.FooMojo;
import org.apache.maven.project.MavenProjectHelper;
/**

View File

@ -1,4 +1,4 @@
package org.apache.maven.tools.plugin.annotations;
package org.apache.maven.tools.plugin.extractor.annotations;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -49,15 +49,15 @@ import org.apache.maven.plugin.descriptor.Requirement;
import org.apache.maven.project.MavenProject;
import org.apache.maven.tools.plugin.ExtendedMojoDescriptor;
import org.apache.maven.tools.plugin.PluginToolsRequest;
import org.apache.maven.tools.plugin.annotations.datamodel.ComponentAnnotationContent;
import org.apache.maven.tools.plugin.annotations.datamodel.ExecuteAnnotationContent;
import org.apache.maven.tools.plugin.annotations.datamodel.MojoAnnotationContent;
import org.apache.maven.tools.plugin.annotations.datamodel.ParameterAnnotationContent;
import org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotatedClass;
import org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotationsScanner;
import org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotationsScannerRequest;
import org.apache.maven.tools.plugin.extractor.ExtractionException;
import org.apache.maven.tools.plugin.extractor.MojoDescriptorExtractor;
import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ComponentAnnotationContent;
import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ExecuteAnnotationContent;
import org.apache.maven.tools.plugin.extractor.annotations.datamodel.MojoAnnotationContent;
import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ParameterAnnotationContent;
import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotatedClass;
import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotationsScanner;
import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotationsScannerRequest;
import org.apache.maven.tools.plugin.util.PluginUtils;
import org.codehaus.plexus.archiver.UnArchiver;
import org.codehaus.plexus.archiver.manager.ArchiverManager;

View File

@ -1,4 +1,4 @@
package org.apache.maven.tools.plugin.annotations.datamodel;
package org.apache.maven.tools.plugin.extractor.annotations.datamodel;
/*
* Licensed to the Apache Software Foundation (ASF) under one

View File

@ -1,4 +1,4 @@
package org.apache.maven.tools.plugin.annotations.datamodel;
package org.apache.maven.tools.plugin.extractor.annotations.datamodel;
/*
* Licensed to the Apache Software Foundation (ASF) under one

View File

@ -1,4 +1,4 @@
package org.apache.maven.tools.plugin.annotations.datamodel;
package org.apache.maven.tools.plugin.extractor.annotations.datamodel;
/*
* Licensed to the Apache Software Foundation (ASF) under one

View File

@ -1,4 +1,4 @@
package org.apache.maven.tools.plugin.annotations.datamodel;
package org.apache.maven.tools.plugin.extractor.annotations.datamodel;
/*
* Licensed to the Apache Software Foundation (ASF) under one

View File

@ -1,4 +1,4 @@
package org.apache.maven.tools.plugin.annotations.datamodel;
package org.apache.maven.tools.plugin.extractor.annotations.datamodel;
/*
* Licensed to the Apache Software Foundation (ASF) under one

View File

@ -1,4 +1,4 @@
package org.apache.maven.tools.plugin.annotations.datamodel;
package org.apache.maven.tools.plugin.extractor.annotations.datamodel;
/*
* Licensed to the Apache Software Foundation (ASF) under one

View File

@ -1,4 +1,4 @@
package org.apache.maven.tools.plugin.annotations.scanner;
package org.apache.maven.tools.plugin.extractor.annotations.scanner;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -24,14 +24,14 @@ import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.tools.plugin.annotations.datamodel.ComponentAnnotationContent;
import org.apache.maven.tools.plugin.annotations.datamodel.ExecuteAnnotationContent;
import org.apache.maven.tools.plugin.annotations.datamodel.MojoAnnotationContent;
import org.apache.maven.tools.plugin.annotations.datamodel.ParameterAnnotationContent;
import org.apache.maven.tools.plugin.annotations.scanner.visitors.MojoAnnotationVisitor;
import org.apache.maven.tools.plugin.annotations.scanner.visitors.MojoClassVisitor;
import org.apache.maven.tools.plugin.annotations.scanner.visitors.MojoFieldVisitor;
import org.apache.maven.tools.plugin.extractor.ExtractionException;
import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ComponentAnnotationContent;
import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ExecuteAnnotationContent;
import org.apache.maven.tools.plugin.extractor.annotations.datamodel.MojoAnnotationContent;
import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ParameterAnnotationContent;
import org.apache.maven.tools.plugin.extractor.annotations.scanner.visitors.MojoAnnotationVisitor;
import org.apache.maven.tools.plugin.extractor.annotations.scanner.visitors.MojoClassVisitor;
import org.apache.maven.tools.plugin.extractor.annotations.scanner.visitors.MojoFieldVisitor;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.IOUtil;
@ -115,7 +115,7 @@ public class DefaultMojoAnnotationsScanner
* @param archiveFile
* @param artifact
* @param excludeMojo for dependencies, we exclude Mojo annotations found
* @return
* @return annotated classes found
* @throws IOException
* @throws ExtractionException
*/
@ -152,7 +152,7 @@ public class DefaultMojoAnnotationsScanner
* @param includePatterns
* @param artifact
* @param excludeMojo for dependencies, we exclude Mojo annotations found
* @return
* @return annotated classes found
* @throws IOException
* @throws ExtractionException
*/

View File

@ -1,4 +1,4 @@
package org.apache.maven.tools.plugin.annotations.scanner;
package org.apache.maven.tools.plugin.extractor.annotations.scanner;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -20,10 +20,10 @@ package org.apache.maven.tools.plugin.annotations.scanner;
*/
import org.apache.maven.artifact.Artifact;
import org.apache.maven.tools.plugin.annotations.datamodel.ComponentAnnotationContent;
import org.apache.maven.tools.plugin.annotations.datamodel.ExecuteAnnotationContent;
import org.apache.maven.tools.plugin.annotations.datamodel.MojoAnnotationContent;
import org.apache.maven.tools.plugin.annotations.datamodel.ParameterAnnotationContent;
import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ComponentAnnotationContent;
import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ExecuteAnnotationContent;
import org.apache.maven.tools.plugin.extractor.annotations.datamodel.MojoAnnotationContent;
import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ParameterAnnotationContent;
import java.util.HashMap;
import java.util.Map;

View File

@ -1,4 +1,4 @@
package org.apache.maven.tools.plugin.annotations.scanner;
package org.apache.maven.tools.plugin.extractor.annotations.scanner;
/*
* Licensed to the Apache Software Foundation (ASF) under one

View File

@ -1,4 +1,4 @@
package org.apache.maven.tools.plugin.annotations.scanner;
package org.apache.maven.tools.plugin.extractor.annotations.scanner;
/*
* Licensed to the Apache Software Foundation (ASF) under one

View File

@ -1,4 +1,4 @@
package org.apache.maven.tools.plugin.annotations.scanner.visitors;
package org.apache.maven.tools.plugin.extractor.annotations.scanner.visitors;
/*
* Licensed to the Apache Software Foundation (ASF) under one

View File

@ -1,4 +1,4 @@
package org.apache.maven.tools.plugin.annotations.scanner.visitors;
package org.apache.maven.tools.plugin.extractor.annotations.scanner.visitors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -19,8 +19,8 @@ package org.apache.maven.tools.plugin.annotations.scanner.visitors;
* under the License.
*/
import org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotatedClass;
import org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotationsScanner;
import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotatedClass;
import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotationsScanner;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.StringUtils;
import org.objectweb.asm.AnnotationVisitor;

View File

@ -1,4 +1,4 @@
package org.apache.maven.tools.plugin.annotations.scanner.visitors;
package org.apache.maven.tools.plugin.extractor.annotations.scanner.visitors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -19,7 +19,7 @@ package org.apache.maven.tools.plugin.annotations.scanner.visitors;
* under the License.
*/
import org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotationsScanner;
import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotationsScanner;
import org.codehaus.plexus.logging.Logger;
import org.objectweb.asm.AnnotationVisitor;
import org.objectweb.asm.Attribute;

View File

@ -1,4 +1,4 @@
package org.apache.maven.tools.plugin.annotations;
package org.apache.maven.tools.plugin.extractor.annotations;
/*
* Licensed to the Apache Software Foundation (ASF) under one

View File

@ -1,4 +1,4 @@
package org.apache.maven.tools.plugin.annotations;
package org.apache.maven.tools.plugin.extractor.annotations;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -24,11 +24,11 @@ import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.project.MavenProject;
import org.apache.maven.tools.plugin.annotations.datamodel.ComponentAnnotationContent;
import org.apache.maven.tools.plugin.annotations.datamodel.ParameterAnnotationContent;
import org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotatedClass;
import org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotationsScanner;
import org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotationsScannerRequest;
import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ComponentAnnotationContent;
import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ParameterAnnotationContent;
import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotatedClass;
import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotationsScanner;
import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotationsScannerRequest;
import org.codehaus.plexus.PlexusTestCase;
import org.fest.assertions.Assertions;

View File

@ -85,7 +85,7 @@ public interface PluginToolsRequest
PluginToolsRequest setSkipErrorNoDescriptorsFound( boolean skipErrorNoDescriptorsFound );
/**
* @return
* @return <code>true</code> if no descriptor found should not cause a failure
* @since 3.0
*/
boolean isSkipErrorNoDescriptorsFound();
@ -93,21 +93,21 @@ public interface PluginToolsRequest
/**
* Returns the list of {@link Artifact} used in class path scanning for annotations
*
* @return
* @return the dependencies
* @since 3.0
*/
Set<Artifact> getDependencies();
/**
* @param dependencies
* @return
* @return This request.
* @since 3.0
*/
PluginToolsRequest setDependencies( Set<Artifact> dependencies );
/**
*
* @return
* @return the remote repositories
* @since 3.0
*/
List<ArtifactRepository> getRemoteRepos();
@ -115,14 +115,14 @@ public interface PluginToolsRequest
/**
*
* @param remoteRepos
* @return
* @return This request.
* @since 3.0
*/
PluginToolsRequest setRemoteRepos( List<ArtifactRepository> remoteRepos );
/**
*
* @return
* @return the local artifact repository
* @since 3.0
*/
ArtifactRepository getLocal();
@ -130,7 +130,7 @@ public interface PluginToolsRequest
/**
*
* @param local
* @return
* @return This request.
* @since 3.0
*/
PluginToolsRequest setLocal( ArtifactRepository local );

View File

@ -91,7 +91,7 @@ public class DefaultMojoScanner
throw new ExtractionException( "No mojo extractor with id: " + extractorId );
}
logger.info( "Applying mojo extractor with id: " + extractorId );
logger.debug( "Applying mojo extractor with id: " + extractorId );
List<MojoDescriptor> extractorDescriptors = extractor.execute( request );

View File

@ -51,9 +51,6 @@ import org.codehaus.plexus.util.xml.XMLWriter;
* corresponding <code>plugin-help.xml</code> help content for {@link PluginHelpGenerator}.
*
* @version $Id$
* @todo add example usage tag that can be shown in the doco
* @todo need to add validation directives so that systems embedding maven2 can
* get validation directives to help users in IDEs.
*/
public class PluginDescriptorGenerator
implements Generator

View File

@ -46,7 +46,6 @@ import java.util.ResourceBundle;
* Generate xdoc documentation for each mojo.
*
* @version $Id$
* @todo add example usage tag that can be shown in the doco
*/
public class PluginXdocGenerator
implements Generator

View File

@ -1,4 +1,4 @@
package org.apache.maven.tools.plugin.extractor.java;
package org.apache.maven.tools.plugin.extractor.javadoc;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -59,8 +59,6 @@ import com.thoughtworks.qdox.model.JavaType;
* <a href="http://maven.apache.org/developers/mojo-api-specification.html">
* http://maven.apache.org/developers/mojo-api-specification.html</a>
*
* @todo need to add validation directives so that systems embedding maven2 can
* get validation directives to help users in IDEs.
* @version $Id$
* @see org.apache.maven.plugin.descriptor.MojoDescriptor
*/
@ -69,94 +67,6 @@ public class JavaJavadocMojoDescriptorExtractor
extends AbstractLogEnabled
implements MojoDescriptorExtractor, JavadocMojoAnnotation
{
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#INSTANTIATION_STRATEGY} instead of. */
public static final String MAVEN_PLUGIN_INSTANTIATION = JavadocMojoAnnotation.INSTANTIATION_STRATEGY;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#CONFIGURATOR} instead of. */
public static final String CONFIGURATOR = JavadocMojoAnnotation.CONFIGURATOR;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#PARAMETER} instead of. */
public static final String PARAMETER = JavadocMojoAnnotation.PARAMETER;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#PARAMETER_EXPRESSION} instead of. */
public static final String PARAMETER_EXPRESSION = JavadocMojoAnnotation.PARAMETER_EXPRESSION;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#PARAMETER_DEFAULT_VALUE} instead of. */
public static final String PARAMETER_DEFAULT_VALUE = JavadocMojoAnnotation.PARAMETER_DEFAULT_VALUE;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#PARAMETER_ALIAS} instead of. */
public static final String PARAMETER_ALIAS = JavadocMojoAnnotation.PARAMETER_ALIAS;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#SINCE} instead of. */
public static final String SINCE = JavadocMojoAnnotation.SINCE;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#PARAMETER_IMPLEMENTATION} instead of. */
public static final String PARAMETER_IMPLEMENTATION = JavadocMojoAnnotation.PARAMETER_IMPLEMENTATION;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#REQUIRED} instead of. */
public static final String REQUIRED = JavadocMojoAnnotation.REQUIRED;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#DEPRECATED} instead of. */
public static final String DEPRECATED = JavadocMojoAnnotation.DEPRECATED;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#READONLY} instead of. */
public static final String READONLY = JavadocMojoAnnotation.READONLY;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#GOAL} instead of. */
public static final String GOAL = JavadocMojoAnnotation.GOAL;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#PHASE} instead of. */
public static final String PHASE = JavadocMojoAnnotation.PHASE;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#EXECUTE} instead of. */
public static final String EXECUTE = JavadocMojoAnnotation.EXECUTE;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#EXECUTE_LIFECYCLE} instead of. */
public static final String EXECUTE_LIFECYCLE = JavadocMojoAnnotation.EXECUTE_LIFECYCLE;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#EXECUTE_PHASE} instead of. */
public static final String EXECUTE_PHASE = JavadocMojoAnnotation.EXECUTE_PHASE;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#EXECUTE_GOAL} instead of. */
public static final String EXECUTE_GOAL = JavadocMojoAnnotation.EXECUTE_GOAL;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#DESCRIPTION} instead of. */
public static final String GOAL_DESCRIPTION = JavadocMojoAnnotation.DESCRIPTION;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#REQUIRES_DEPENDENCY_RESOLUTION} instead of. */
public static final String GOAL_REQUIRES_DEPENDENCY_RESOLUTION =
JavadocMojoAnnotation.REQUIRES_DEPENDENCY_RESOLUTION;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#REQUIRES_PROJECT} instead of. */
public static final String GOAL_REQUIRES_PROJECT = JavadocMojoAnnotation.REQUIRES_PROJECT;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#REQUIRES_REPORTS} instead of. */
public static final String GOAL_REQUIRES_REPORTS = JavadocMojoAnnotation.REQUIRES_REPORTS;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#AGGREGATOR} instead of. */
public static final String GOAL_IS_AGGREGATOR = JavadocMojoAnnotation.AGGREGATOR;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#REQUIRES_ONLINE} instead of. */
public static final String GOAL_REQUIRES_ONLINE = JavadocMojoAnnotation.REQUIRES_ONLINE;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#INHERIT_BY_DEFAULT} instead of. */
public static final String GOAL_INHERIT_BY_DEFAULT = JavadocMojoAnnotation.INHERIT_BY_DEFAULT;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#MULTI_EXECUTION_STRATEGY} instead of. */
public static final String GOAL_MULTI_EXECUTION_STRATEGY = JavadocMojoAnnotation.MULTI_EXECUTION_STRATEGY;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#REQUIRES_DIRECT_INVOCATION} instead of. */
public static final String GOAL_REQUIRES_DIRECT_INVOCATION = JavadocMojoAnnotation.REQUIRES_DIRECT_INVOCATION;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#COMPONENT} instead of. */
public static final String COMPONENT = JavadocMojoAnnotation.COMPONENT;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#COMPONENT_ROLE} instead of. */
public static final String COMPONENT_ROLE = JavadocMojoAnnotation.COMPONENT_ROLE;
/** @deprecated since 2.4, use {@link JavadocMojoAnnotation#COMPONENT_ROLEHINT} instead of. */
public static final String COMPONENT_ROLEHINT = JavadocMojoAnnotation.COMPONENT_ROLEHINT;
/**
* @param parameter not null
* @param i positive number

View File

@ -1,4 +1,4 @@
package org.apache.maven.tools.plugin.extractor.java;
package org.apache.maven.tools.plugin.extractor.javadoc;
/*
* Licensed to the Apache Software Foundation (ASF) under one

View File

@ -1,4 +1,4 @@
package org.apache.maven.tools.plugin.extractor.java;
package org.apache.maven.tools.plugin.extractor.javadoc;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -23,6 +23,7 @@ import java.io.File;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
@ -33,6 +34,7 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.tools.plugin.DefaultPluginToolsRequest;
import org.apache.maven.tools.plugin.ExtendedMojoDescriptor;
import org.apache.maven.tools.plugin.PluginToolsRequest;
import org.apache.maven.tools.plugin.extractor.javadoc.JavaJavadocMojoDescriptorExtractor;
import org.apache.maven.tools.plugin.generator.Generator;
import org.apache.maven.tools.plugin.generator.PluginDescriptorGenerator;
import org.apache.maven.tools.plugin.util.PluginUtils;
@ -42,6 +44,7 @@ import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.codehaus.plexus.util.FileUtils;
import junit.framework.TestCase;
import org.custommonkey.xmlunit.Diff;
import org.custommonkey.xmlunit.XMLUnit;
import org.w3c.dom.Document;

View File

@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
import java.util.Map;
import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
import com.sun.tools.doclets.Taglet;

View File

@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
import java.util.Map;
import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
import com.sun.tools.doclets.Taglet;

View File

@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
import java.util.Map;
import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
import com.sun.tools.doclets.Taglet;

View File

@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
import java.util.Map;
import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
import com.sun.tools.doclets.Taglet;

View File

@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
import java.util.Map;
import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
import com.sun.tools.doclets.Taglet;

View File

@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
import java.util.Map;
import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
import com.sun.tools.doclets.Taglet;

View File

@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
import java.util.Map;
import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
import com.sun.tools.doclets.Taglet;

View File

@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
import java.util.Map;
import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
import com.sun.tools.doclets.Taglet;

View File

@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
import java.util.Map;
import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
import com.sun.tools.doclets.Taglet;

View File

@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
import java.util.Map;
import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
import com.sun.tools.doclets.Taglet;

View File

@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
import java.util.Map;
import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
import com.sun.tools.doclets.Taglet;

View File

@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
import java.util.Map;
import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
import com.sun.tools.doclets.Taglet;

View File

@ -20,7 +20,8 @@ package org.apache.maven.tools.plugin.javadoc;
*/
import com.sun.tools.doclets.Taglet;
import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
import java.util.Map;

View File

@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
import java.util.Map;
import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
import com.sun.tools.doclets.Taglet;

View File

@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
import java.util.Map;
import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
import com.sun.tools.doclets.Taglet;

View File

@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
import java.util.Map;
import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
import com.sun.tools.doclets.Taglet;

View File

@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
import java.util.Map;
import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
import com.sun.tools.doclets.Taglet;

View File

@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
import java.util.Map;
import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
import com.sun.tools.doclets.Taglet;

View File

@ -20,7 +20,8 @@ package org.apache.maven.tools.plugin.javadoc;
*/
import com.sun.tools.doclets.Taglet;
import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
import java.util.Map;

View File

@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools</artifactId>
<artifactId>maven-script</artifactId>
<version>3.4</version>
</parent>

View File

@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools</artifactId>
<artifactId>maven-script</artifactId>
<version>3.4</version>
</parent>

View File

@ -41,10 +41,6 @@ import java.util.Set;
* Extracts Mojo descriptors from <a href="http://www.beanshell.org/">BeanShell</a> sources.
*
* @version $Id$
* @todo share constants
* @todo add example usage tag that can be shown in the doco
* @todo need to add validation directives so that systems embedding maven2 can
* get validation directives to help users in IDEs.
*/
@Component( role = MojoDescriptorExtractor.class, hint = "bsh" )
public class BeanshellMojoDescriptorExtractor

View File

@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools</artifactId>
<artifactId>maven-script</artifactId>
<version>3.4</version>
</parent>

View File

@ -30,8 +30,6 @@ import org.codehaus.plexus.component.factory.bsh.BshComponent;
/**
* Mojo adapter for a Beanshell Mojo.
*
* @todo should log be passed in, or rely on getLog() ?
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @version $Id$
*/

View File

@ -33,8 +33,11 @@ under the License.
<description>Maven Script Mojo Support lets developer write Maven plugins/goals with scripting languages instead of compiled Java.</description>
<modules>
<module>maven-plugin-tools-ant</module>
<module>maven-script-ant</module>
<module>maven-plugin-tools-beanshell</module>
<module>maven-script-beanshell</module>
<module>maven-plugin-tools-model</module>
</modules>

38
pom.xml
View File

@ -63,17 +63,14 @@
</prerequisites>
<modules>
<module>maven-plugin-plugin</module>
<module>maven-plugin-tools-generators</module>
<module>maven-plugin-tools-api</module>
<module>maven-plugin-tools-java</module>
<module>maven-plugin-tools-annotations</module>
<module>maven-plugin-tools-javadoc</module>
<module>maven-plugin-annotations</module>
<module>maven-plugin-tools-ant</module>
<module>maven-plugin-tools-beanshell</module>
<module>maven-plugin-tools-model</module>
<module>maven-script</module>
<module>maven-plugin-plugin</module><!-- keep at end since ITs require every extractors -->
</modules>
<scm>
@ -298,9 +295,36 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<linksource>true</linksource>
<links combine.children="append">
<link>http://sonatype.github.com/sonatype-aether/apidocs/</link>
</links>
<groups>
<group>
<title>Plugin Tools' Maven Plugin Plugin</title>
<packages>org.apache.maven.plugin.plugin*</packages>
</group>
<group>
<title>Plugin Tools Extractor API</title>
<packages>org.apache.maven.tools.plugin:org.apache.maven.tools.plugin.extractor:org.apache.maven.tools.plugin.scanner:org.apache.maven.tools.plugin.util</packages>
</group>
<group>
<title>Plugin Tools Generators</title>
<packages>org.apache.maven.tools.plugin.generator</packages>
</group>
<group>
<title>Java Annotations Support: Annotations + Extractor</title>
<packages>org.apache.maven.plugins.annotations:org.apache.maven.tools.plugin.extractor.annotations*</packages>
</group>
<group>
<title>Javadoc Support: Javadoc Tags Extractor + Taglets</title>
<packages>org.apache.maven.tools.plugin.extractor.javadoc:org.apache.maven.tools.plugin.javadoc</packages>
</group>
<group>
<title>Beanshell Support: Extractor + Runtime</title>
<packages>org.apache.maven.tools.plugin.extractor.beanshell:org.apache.maven.script.beanshell</packages>
</group>
<group>
<title>Apache Ant Support : Metadata + Extractor + Runtime</title>
<packages>org.apache.maven.tools.plugin.extractor.ant:org.apache.maven.script.ant:org.apache.maven.plugin.tools.model*</packages>
</group>
</groups>
</configuration>
<reportSets>
<reportSet>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 65 KiB

After

Width:  |  Height:  |  Size: 46 KiB

View File

@ -38,28 +38,27 @@
like Ant or Beanshell.</p>
<p>
<img src="images/plugin-tools-deps.png" width="826" height="491" border="0" usemap="#PluginTools_dependencies" />
<img src="images/plugin-tools-deps.png" width="759" height="474" border="0" usemap="#PluginTools_dependencies" />
<map name="PluginTools_dependencies">
<area shape="rect" coords="279,0,508,38" alt="maven-plugin-plugin" href="./maven-plugin-plugin" />
<area shape="rect" coords="31,101,223,138" alt="plugin-tools-api" href="./maven-plugin-tools-api"/>
<area shape="rect" coords="62,163,251,200" alt="plugin-tools-java" href="./maven-plugin-tools-java"/>
<area shape="rect" coords="312,163,539,200" alt="plugin-tools-javadoc" href="./maven-plugin-tools-javadoc"/>
<area shape="rect" coords="61,225,319,262" alt="plugin-tools-annotations" href="./maven-plugin-tools-annotations"/>
<area shape="rect" coords="339,225,539,262" alt="plugin-annotations" href="./maven-plugin-annotations"/>
<area shape="rect" coords="61,286,320,324" alt="plugin-tools-beanshell" href="./maven-plugin-tools-beanshell"/>
<area shape="rect" coords="348,286,605,324" alt="maven-script-beanshell" href="./maven-script/maven-script-beanshell"/>
<area shape="rect" coords="61,348,244,386" alt="plugin-tools-ant" href="./maven-plugin-tools-ant"/>
<area shape="rect" coords="423,348,605,386" alt="maven-script-ant" href="./maven-script/maven-script-ant"/>
<area shape="rect" coords="339,277,623,421" alt="maven-script" href="./maven-script"/>
<area shape="rect" coords="43,410,261,447" alt="plugin-tools-model" href="./maven-plugin-tools-model"/>
<area shape="rect" coords="538,101,804,139" alt="plugin-tools-generators" href="./maven-plugin-tools-generators"/>
<area shape="rect" coords="380,454,584,490" alt="maven-plugin-api" href="/ref/current/maven-plugin-api/"/>
<area shape="rect" coords="556,163,633,200" alt="qdox" href="http://qdox.codehaus.org/"/>
<area shape="rect" coords="555,225,634,262" alt="asm" href="http://asm.ow2.org/"/>
<area shape="rect" coords="657,142,825,178" alt="Doxia" href="/doxia/"/>
<area shape="rect" coords="657,181,825,218" alt="plexus-velocity" href="http://plexus.codehaus.org/plexus-components/plexus-velocity/"/>
<area shape="rect" coords="652,287,777,324" alt="beanshell" href="http://www.beanshell.org/"/>
<area shape="rect" coords="651,348,730,386" alt="ant" href="http://ant.apache.maven/"/>
<area shape="rect" coords="256,0,467,34" alt="maven-plugin-plugin" href="./maven-plugin-plugin" />
<area shape="rect" coords="28,95,205,131" alt="plugin-tools-api" href="./maven-plugin-tools-api"/>
<area shape="rect" coords="287,154,496,190" alt="plugin-tools-javadoc" href="./maven-plugin-tools-javadoc"/>
<area shape="rect" coords="44,146,508,198" alt="plugin-tools-java" href="./maven-plugin-tools-java"/>
<area shape="rect" coords="311,213,496,248" alt="plugin-annotations" href="./maven-plugin-annotations"/>
<area shape="rect" coords="44,204,508,256" alt="plugin-tools-annotations" href="./maven-plugin-tools-annotations"/>
<area shape="rect" coords="55,270,293,306" alt="plugin-tools-beanshell" href="./maven-plugin-tools-beanshell"/>
<area shape="rect" coords="319,271,557,306" alt="maven-script-beanshell" href="./maven-script/maven-script-beanshell"/>
<area shape="rect" coords="56,329,223,365" alt="plugin-tools-ant" href="./maven-plugin-tools-ant"/>
<area shape="rect" coords="388,329,557,365" alt="maven-script-ant" href="./maven-script/maven-script-ant"/>
<area shape="rect" coords="48,388,231,424" alt="plugin-tools-model" href="./maven-plugin-tools-model"/>
<area shape="rect" coords="514,95,759,131" alt="plugin-tools-generators" href="./maven-plugin-tools-generators"/>
<area shape="rect" coords="44,263,570,432" alt="maven-script" href="./maven-script"/>
<area shape="rect" coords="340,438,529,474" alt="maven-plugin-api" href="/ref/current/maven-plugin-api/"/>
<area shape="rect" coords="510,154,582,190" alt="qdox" href="http://qdox.codehaus.org/"/>
<area shape="rect" coords="510,212,583,248" alt="asm" href="http://asm.ow2.org/"/>
<area shape="rect" coords="656,134,747,169" alt="Doxia" href="/doxia/"/>
<area shape="rect" coords="599,271,715,306" alt="Beanshell" href="http://www.beanshell.org/"/>
<area shape="rect" coords="600,329,670,366" alt="Ant" href="http://ant.apache.maven/"/>
</map>
</p>
@ -75,11 +74,11 @@
</tr>
<tr>
<td><a href="./maven-plugin-tools-api/index.html">maven-plugin-tools-api</a></td>
<td>Descriptor extractor API, used by maven-plugin-plugin to extract Plugin information.</td>
<td>Extractor API, used by maven-plugin-plugin to extract Mojo information.</td>
</tr>
<tr>
<td>&nbsp;&nbsp;<a href="./maven-plugin-tools-java/index.html">maven-plugin-tools-java</a></td>
<td>Descriptor extractor for plugins written in Java annotated with Mojo Javadoc Tags.</td>
<td>Extractor for plugins written in Java annotated with Mojo Javadoc Tags.</td>
</tr>
<tr>
<td>&nbsp;&nbsp;&nbsp;&nbsp;<a href="./maven-plugin-tools-javadoc/index.html">maven-plugin-tools-javadoc</a></td>
@ -87,36 +86,36 @@
</tr>
<tr>
<td>&nbsp;&nbsp;<a href="./maven-plugin-tools-annotations/index.html">maven-plugin-tools-annotations</a></td>
<td>Descriptor extractor for plugins written in Java with Java 5 annotations.</td>
<td>Extractor for plugins written in Java with Java 5 annotations.</td>
</tr>
<tr>
<td>&nbsp;&nbsp;&nbsp;&nbsp;<a href="./maven-plugin-annotations/index.html">maven-plugin-annotations</a></td>
<td>Provides the Java 5 annotations to use in Mojos.</td>
</tr>
<tr>
<td>&nbsp;&nbsp;<a href="./maven-plugin-tools-beanshell/index.html">maven-plugin-tools-beanshell</a></td>
<td>Descriptor extractor for plugins written in Beanshell.</td>
</tr>
<tr>
<td>&nbsp;&nbsp;<a href="./maven-plugin-tools-ant/index.html">maven-plugin-tools-ant</a></td>
<td>Descriptor extractor for plugins written in Ant.</td>
</tr>
<tr>
<td><a href="./maven-plugin-tools-model/index.html">maven-plugin-tools-model</a></td>
<td>API to play with the Maven Plugin Metadata Model for script-based plugins.</td>
</tr>
<tr>
<td><a href="./maven-script/index.html">maven-script</a></td>
<td>Maven Script Mojo Support lets developer write Maven plugins/goals with scripting languages instead of compiled Java.</td>
</tr>
<tr>
<td>&nbsp;&nbsp;<a href="./maven-script/maven-plugin-tools-beanshell/index.html">maven-plugin-tools-beanshell</a></td>
<td>Extractor for plugins written in Beanshell.</td>
</tr>
<tr>
<td>&nbsp;&nbsp;<a href="./maven-script/maven-script-beanshell/index.html">maven-script-beanshell</a></td>
<td>Maven Beanshell Mojo Support, ie write Maven plugins with Beanshell scripts.</td>
</tr>
<tr>
<td>&nbsp;&nbsp;<a href="./maven-script/maven-script-ant/index.html">maven-script-ant</a></td>
<td>&nbsp;&nbsp;<a href="./maven-plugin-tools-ant/index.html">maven-plugin-tools-ant</a></td>
<td>Extractor for plugins written in Ant.</td>
</tr>
<tr>
<td>&nbsp;&nbsp;<a href="./maven-script/maven-script/maven-script-ant/index.html">maven-script-ant</a></td>
<td>Maven Ant Mojo Support, ie write Maven plugins with Ant script.</td>
</tr>
<tr>
<td>&nbsp;&nbsp;<a href="./maven-script/maven-plugin-tools-model/index.html">maven-plugin-tools-model</a></td>
<td>Plugin Metadata Model for script-based plugins.</td>
</tr>
</table>
<subsection name="See Also">

Binary file not shown.