You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2017/12/20 09:26:49 UTC
[maven-antrun-plugin] 02/21: Moved execution code to abstract base
class, so other ant-enabled plugins may use this more easily.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to annotated tag maven-antrun-plugin-1.0
in repository https://gitbox.apache.org/repos/asf/maven-antrun-plugin.git
commit 5f268c459b56365e1d9d2f878b7ef97f49b859ce
Author: Kenney Westerhof <ke...@apache.org>
AuthorDate: Sat Aug 13 15:01:24 2005 +0000
Moved execution code to abstract base class, so other ant-enabled plugins
may use this more easily.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk/maven-plugins/maven-antrun-plugin@232501 13f79535-47bb-0310-9956-ffa450edef68
---
.../{AntRunMojo.java => AbstractAntMojo.java} | 42 ++++------------------
.../org/apache/maven/plugin/antrun/AntRunMojo.java | 28 ++-------------
.../antrun/components/AntTargetConverter.java | 10 ++++--
3 files changed, 17 insertions(+), 63 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java b/src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java
similarity index 67%
copy from src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
copy to src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java
index 7cba538..8c7ecfe 100644
--- a/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
+++ b/src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java
@@ -24,60 +24,32 @@ import org.apache.tools.ant.PropertyHelper;
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" );
}
diff --git a/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java b/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
index 7cba538..126dfe9 100644
--- a/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
+++ b/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
@@ -41,7 +41,7 @@ import org.apache.tools.ant.Target;
*
*/
public class AntRunMojo
- extends AbstractMojo
+ extends AbstractAntMojo
{
/**
* @parameter expression="${project}"
@@ -60,30 +60,6 @@ public class AntRunMojo
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 );
}
}
diff --git a/src/main/java/org/apache/maven/plugin/antrun/components/AntTargetConverter.java b/src/main/java/org/apache/maven/plugin/antrun/components/AntTargetConverter.java
index 850f954..095e63e 100644
--- a/src/main/java/org/apache/maven/plugin/antrun/components/AntTargetConverter.java
+++ b/src/main/java/org/apache/maven/plugin/antrun/components/AntTargetConverter.java
@@ -18,6 +18,8 @@ package org.apache.maven.plugin.antrun.components;
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 @@ public class AntTargetConverter
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 @@ public class AntTargetConverter
wrapper, project, target,
childConfiguration, expressionEvaluator
);
-
}
}
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.