You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ke...@apache.org on 2005/08/13 17:01:31 UTC
svn commit: r232501 - in
/maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun:
AbstractAntMojo.java AntRunMojo.java components/AntTargetConverter.java
Author: kenney
Date: Sat Aug 13 08:01:24 2005
New Revision: 232501
URL: http://svn.apache.org/viewcvs?rev=232501&view=rev
Log:
Moved execution code to abstract base class, so other ant-enabled plugins
may use this more easily.
Added:
maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java
- copied, changed from r232351, maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
Modified:
maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/components/AntTargetConverter.java
Copied: maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java (from r232351, maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java)
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java?p2=maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java&p1=maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java&r1=232351&r2=232501&rev=232501&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java Sat Aug 13 08:01:24 2005
@@ -24,60 +24,32 @@
import org.apache.tools.ant.Target;
/**
- * Maven AntRun Mojo.
- *
- * This plugin provides the capability of calling ant tasks
- * from a POM. It is encouraged to move the actual tasks to
- * a separate build.xml file and call that file with an
- * <ant/> task.
- *
* @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
- *
- * @configurator override
- *
- * @goal run
- *
- * @description Runs the nested ant tasks
- *
*/
-public class AntRunMojo
+public abstract class AbstractAntMojo
extends AbstractMojo
{
- /**
- * @parameter expression="${project}"
- * @required
- * @readonly
- */
- private MavenProject project;
-
- /**
- * @parameter expression="${tasks}"
- */
- private Target tasks;
-
- /**
- */
- public void execute()
+ protected void executeTasks( Target antTasks, MavenProject mavenProject )
throws MojoExecutionException
{
- try
+ try
{
PropertyHelper propertyHelper = PropertyHelper.getPropertyHelper(
- tasks.getProject()
+ antTasks.getProject()
);
propertyHelper.setNext(
- new AntPropertyHelper( project, getLog() )
+ new AntPropertyHelper( mavenProject, getLog() )
);
DefaultLogger antLogger = new DefaultLogger();
antLogger.setOutputPrintStream( System.out );
antLogger.setErrorPrintStream( System.err );
- tasks.getProject().addBuildListener( antLogger );
+ antTasks.getProject().addBuildListener( antLogger );
getLog().info( "Executing tasks" );
- tasks.execute();
+ antTasks.execute();
getLog().info( "Executed tasks" );
}
Modified: maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java?rev=232501&r1=232500&r2=232501&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java Sat Aug 13 08:01:24 2005
@@ -41,7 +41,7 @@
*
*/
public class AntRunMojo
- extends AbstractMojo
+ extends AbstractAntMojo
{
/**
* @parameter expression="${project}"
@@ -60,30 +60,6 @@
public void execute()
throws MojoExecutionException
{
- try
- {
- PropertyHelper propertyHelper = PropertyHelper.getPropertyHelper(
- tasks.getProject()
- );
-
- propertyHelper.setNext(
- new AntPropertyHelper( project, getLog() )
- );
-
- DefaultLogger antLogger = new DefaultLogger();
- antLogger.setOutputPrintStream( System.out );
- antLogger.setErrorPrintStream( System.err );
- tasks.getProject().addBuildListener( antLogger );
-
- getLog().info( "Executing tasks" );
-
- tasks.execute();
-
- getLog().info( "Executed tasks" );
- }
- catch ( Exception e )
- {
- throw new MojoExecutionException( "Error executing ant tasks", e );
- }
+ executeTasks( tasks, project );
}
}
Modified: maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/components/AntTargetConverter.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/components/AntTargetConverter.java?rev=232501&r1=232500&r2=232501&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/components/AntTargetConverter.java (original)
+++ maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/components/AntTargetConverter.java Sat Aug 13 08:01:24 2005
@@ -18,6 +18,8 @@
import org.apache.tools.ant.ComponentHelper;
import org.apache.tools.ant.Project;
+import org.apache.tools.ant.ProjectHelper;
+import org.apache.tools.ant.Project;
import org.apache.tools.ant.RuntimeConfigurable;
import org.apache.tools.ant.Target;
import org.apache.tools.ant.UnknownElement;
@@ -112,9 +114,14 @@
task.setProject( project );
task.setNamespace( "" );
task.setQName( childConfiguration.getName() );
- task.setTaskType( childConfiguration.getName() );
+ task.setTaskType(
+ ProjectHelper.genComponentName(
+ task.getNamespace(), childConfiguration.getName()
+ )
+ );
task.setTaskName( childConfiguration.getName() );
task.setOwningTarget( target );
+ task.init();
if ( parent != null )
{
@@ -186,7 +193,6 @@
wrapper, project, target,
childConfiguration, expressionEvaluator
);
-
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org