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/09/15 22:56:15 UTC
svn commit: r997502 - in /maven/plugins/trunk/maven-antrun-plugin/src/site:
./ apt/ apt/examples/ apt/tasks/
Author: pgier
Date: Wed Sep 15 20:56:14 2010
New Revision: 997502
URL: http://svn.apache.org/viewvc?rev=997502&view=rev
Log:
[MANTRUN-150] Update site docs to reflect change from "tasks" to "target"
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/classpaths.apt.vm
maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/customTasks.apt.vm
maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/tasksAttributes.apt.vm
maven/plugins/trunk/maven-antrun-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-antrun-plugin/src/site/apt/tasks/attachArtifact.apt.vm
maven/plugins/trunk/maven-antrun-plugin/src/site/apt/tasks/dependencyFilesets.apt.vm
maven/plugins/trunk/maven-antrun-plugin/src/site/apt/tasks/versionMapper.apt.vm
maven/plugins/trunk/maven-antrun-plugin/src/site/apt/usage.apt.vm
maven/plugins/trunk/maven-antrun-plugin/src/site/site.xml
Modified: maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/classpaths.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/classpaths.apt.vm?rev=997502&r1=997501&r2=997502&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/classpaths.apt.vm (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/classpaths.apt.vm Wed Sep 15 20:56:14 2010
@@ -72,7 +72,7 @@ Referencing the Maven Classpaths
<id>compile</id>
<phase>compile</phase>
<configuration>
- <tasks>
+ <target>
<property name="compile_classpath" refid="maven.compile.classpath"/>
<property name="runtime_classpath" refid="maven.runtime.classpath"/>
<property name="test_classpath" refid="maven.test.classpath"/>
@@ -82,7 +82,7 @@ Referencing the Maven Classpaths
<echo message="runtime classpath: ${runtime_classpath}"/>
<echo message="test classpath: ${test_classpath}"/>
<echo message="plugin classpath: ${plugin_classpath}"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -117,7 +117,7 @@ Referencing the Maven Classpaths
<id>compile</id>
<phase>compile</phase>
<configuration>
- <tasks>
+ <target>
<property name="compile_classpath" refid="maven.compile.classpath"/>
<property name="runtime_classpath" refid="maven.runtime.classpath"/>
<property name="test_classpath" refid="maven.test.classpath"/>
@@ -126,7 +126,7 @@ Referencing the Maven Classpaths
<ant antfile="${basedir}/build.xml">
<target name="test"/>
</ant>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/customTasks.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/customTasks.apt.vm?rev=997502&r1=997501&r2=997502&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/customTasks.apt.vm (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/customTasks.apt.vm Wed Sep 15 20:56:14 2010
@@ -49,7 +49,7 @@ Using tasks not included in Ant's defaul
<id>ftp</id>
<phase>deploy</phase>
<configuration>
- <tasks>
+ <target>
<ftp action="send" server="myhost" remotedir="/home/test" userid="x" password="y" depends="yes" verbose="yes">
<fileset dir="\${project.build.directory}">
@@ -60,7 +60,7 @@ Using tasks not included in Ant's defaul
<taskdef name="myTask" classname="com.acme.MyTask" classpathref="maven.plugin.classpath"/>
<myTask a="b"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/tasksAttributes.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/tasksAttributes.apt.vm?rev=997502&r1=997501&r2=997502&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/tasksAttributes.apt.vm (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/tasksAttributes.apt.vm Wed Sep 15 20:56:14 2010
@@ -26,9 +26,9 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Using <<<\<tasks/\>>>> Attributes
+Using <<<\<target/\>>>> Attributes
- Since plugin version 1.2 you can specify attributes in the <<<\<tasks/\>>>> configuration to execute or not
+ Since plugin version 1.2 you can specify attributes in the <<<\<target/\>>>> configuration to execute or not
Ant tasks depending some conditions. For example, to skip Ant call, you could add the following:
------
@@ -46,9 +46,9 @@ Using <<<\<tasks/\>>>> Attributes
<phase> <!-- a lifecycle phase --> </phase>
<configuration>
- <tasks unless="maven.test.skip">
+ <target unless="maven.test.skip">
<echo message="To skip me, just call mvn -Dmaven.test.skip=true"/>
- </tasks>
+ </target>
</configuration>
<goals>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/site/apt/index.apt?rev=997502&r1=997501&r2=997502&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/site/apt/index.apt Wed Sep 15 20:56:14 2010
@@ -72,7 +72,7 @@ Maven AntRun Plugin
* {{{./examples/classpaths.html}Referencing the Maven Classpaths}}
- * {{{./examples/tasksAttributes.html}Using <<<\<tasks/\>>>> Attributes}}
+ * {{{./examples/tasksAttributes.html}Using <<<\<target/\>>>> Attributes}}
* {{{./examples/customTasks.html}Using tasks not included in Ant's default jar}}
Modified: maven/plugins/trunk/maven-antrun-plugin/src/site/apt/tasks/attachArtifact.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/site/apt/tasks/attachArtifact.apt.vm?rev=997502&r1=997501&r2=997502&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/site/apt/tasks/attachArtifact.apt.vm (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/site/apt/tasks/attachArtifact.apt.vm Wed Sep 15 20:56:14 2010
@@ -61,13 +61,13 @@ AttachArtifact Task
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<zip destfile="my-project-src.zip"
basedir="."
includes="*.*"
/>
<attachartifact file="my-project-src.zip" classifier="src" type="zip"/>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/site/apt/tasks/dependencyFilesets.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/site/apt/tasks/dependencyFilesets.apt.vm?rev=997502&r1=997501&r2=997502&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/site/apt/tasks/dependencyFilesets.apt.vm (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/site/apt/tasks/dependencyFilesets.apt.vm Wed Sep 15 20:56:14 2010
@@ -68,7 +68,7 @@ DependencyFilesets Task
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<dependencyfilesets prefix="mydeps."/>
<mkdir dir="target/dependencies"/>
@@ -82,7 +82,7 @@ DependencyFilesets Task
<fileset refid="mydeps.maven.project.dependencies"/>
</copy>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/site/apt/tasks/versionMapper.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/site/apt/tasks/versionMapper.apt.vm?rev=997502&r1=997501&r2=997502&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/site/apt/tasks/versionMapper.apt.vm (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/site/apt/tasks/versionMapper.apt.vm Wed Sep 15 20:56:14 2010
@@ -48,7 +48,7 @@ VersionMapper
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<mapper id="remove-versions"
classname="org.apache.maven.ant.tasks.support.VersionMapper"
from="${maven.project.dependencies.versions}"
@@ -59,7 +59,7 @@ VersionMapper
</path>
<mapper refid="remove-versions" />
</copy>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/site/apt/usage.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/site/apt/usage.apt.vm?rev=997502&r1=997501&r2=997502&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/site/apt/usage.apt.vm (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/site/apt/usage.apt.vm Wed Sep 15 20:56:14 2010
@@ -33,8 +33,8 @@ Usage
The maven-antrun-plugin has only one goal, <<<run>>>.
This allows Maven 2 to run Ant tasks. To do so, there must be an existing
- project and maven-antrun-plugin must have its <<<\<tasks\>>>> tag
- configured (although it would still execute without the <<<\<tasks\>>>> tag,
+ project and maven-antrun-plugin must have its <<<\<target\>>>> tag
+ configured (although it would still execute without the <<<\<target\>>>> tag,
it would not do anything). Below is the template for
<<<maven-antrun-plugin>>>'s <<<pom.xml>>>.
@@ -50,7 +50,7 @@ Usage
<execution>
<phase> <!-- a lifecycle phase --> </phase>
<configuration>
- <tasks>
+ <target>
<!--
Place any Ant task here. You can add anything
@@ -58,7 +58,7 @@ Usage
build.xml.
-->
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -76,12 +76,12 @@ Usage
<<<\<execution/\>>>> section and specifying a new phase.
Ultimately, you could specify some Ant {{{http://ant.apache.org/manual/using.html#targets}<<<\<target/\>>>>}}
- attributes in the <<<\<tasks/\>>>> tag. Only <<<depends>>> attribute in Ant <<<\<target/\>>>> is not wrapped.
+ attributes in the <<<\<target/\>>>> tag. Only <<<depends>>> attribute in Ant <<<\<target/\>>>> is not wrapped.
------
[...]
<configuration>
- <tasks name="The name of the tasks"
+ <target name="The name of the target"
if="The name of the property that must be set in order for this task"
unless="The name of the property that must NOT be set in order for this task"
description="A short description of this target's function">
@@ -92,7 +92,7 @@ Usage
build.xml.
-->
- </tasks>
+ </target>
<configuration>
[...]
------
@@ -106,7 +106,7 @@ Usage
* Using maven properties
- All of the properties available to maven are also available in the tasks
+ All of the properties available to maven are also available in the target
configuration. However, you may want to call an external Ant build script
using the <ant> task. To avoid name conflicts, only a subset of the properties
are passed to the external Ant build. These include all properties defined in
Modified: maven/plugins/trunk/maven-antrun-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/site/site.xml?rev=997502&r1=997501&r2=997502&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/site/site.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/site/site.xml Wed Sep 15 20:56:14 2010
@@ -37,7 +37,7 @@ under the License.
</menu>
<menu name="Examples">
<item name="Referencing the Maven Classpaths" href="examples/classpaths.html"/>
- <item name="Using tasks Attributes" href="examples/tasksAttributes.html"/>
+ <item name="Using target attributes" href="examples/tasksAttributes.html"/>
<item name="Using tasks not included in Ant's default jar" href="examples/customTasks.html"/>
</menu>
</body>