You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by pg...@apache.org on 2010/07/02 19:03:08 UTC
svn commit: r960056 -
/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
Author: pgier
Date: Fri Jul 2 17:03:08 2010
New Revision: 960056
URL: http://svn.apache.org/viewvc?rev=960056&view=rev
Log:
[MANTRUN-132] Allow user to set the tag prefix used to reference the xml namespace of the include custom tasks.
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java?rev=960056&r1=960055&r2=960056&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java Fri Jul 2 17:03:08 2010
@@ -137,12 +137,14 @@ public class AntRunMojo
private String propertyPrefix;
/**
- * The xml namespace to use for the built in Ant tasks.
+ * The xml tag prefix to use for the built in Ant tasks. This prefix needs to be prepended to each task referenced
+ * in the antrun target config. For example, a prefix of "mvn" means that the attachartifact task is referenced by
+ * "<mvn:attachartifact>" The default value of an empty string means that no prefix is used for the tasks.
*
- * @parameter default-value="mvn"
+ * @parameter default-value=""
* @since 1.5
*/
- private String taskNamespace;
+ private String customTaskPrefix = "";
/**
* The name of a property containing the list of all dependency versions. This is used for the removing the versions
@@ -413,7 +415,10 @@ public class AntRunMojo
Typedef typedef = new Typedef();
typedef.setProject( antProject );
typedef.setResource( ANTLIB );
- // typedef.setURI( TASK_URI );
+ if ( ! customTaskPrefix.equals( "" ) )
+ {
+ typedef.setURI( TASK_URI );
+ }
typedef.execute();
}
@@ -444,7 +449,13 @@ public class AntRunMojo
stringReplace( antProjectConfig, "<target", "<target name=\"" + antTargetName + "\"" );
}
- final String projectOpen = "<project name=\"maven-antrun-\" default=\"" + antTargetName + "\">\n";
+ String xmlns = "";
+ if ( ! customTaskPrefix.trim().equals( "" ) )
+ {
+ xmlns = "xmlns:" + customTaskPrefix + "=\"" + TASK_URI + "\"";
+ }
+
+ final String projectOpen = "<project name=\"maven-antrun-\" default=\"" + antTargetName + "\" " + xmlns +" >\n";
int index = antProjectConfig.indexOf( "<target" );
antProjectConfig.insert( index, projectOpen );