You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ar...@apache.org on 2006/08/04 05:10:23 UTC

svn commit: r428603 - in /maven/plugins/trunk/maven-antrun-plugin/src/site: apt/examples/classpaths.apt apt/usage.apt fml/faq.fml

Author: aramirez
Date: Thu Aug  3 20:10:22 2006
New Revision: 428603

URL: http://svn.apache.org/viewvc?rev=428603&view=rev
Log:
PR: MANTRUN-55
Submitted By: Franz See

applied comments from the dev list

Modified:
    maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/classpaths.apt
    maven/plugins/trunk/maven-antrun-plugin/src/site/apt/usage.apt
    maven/plugins/trunk/maven-antrun-plugin/src/site/fml/faq.fml

Modified: maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/classpaths.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/classpaths.apt?rev=428603&r1=428602&r2=428603&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/classpaths.apt (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/classpaths.apt Thu Aug  3 20:10:22 2006
@@ -27,8 +27,6 @@
 
  You can use these classpath references:
   
-  * <<<maven.dependency.classpath>>> (deprecated, equal to <<<maven.compile.classpath>>>)
-
   * <<<maven.compile.classpath>>>
 
   * <<<maven.runtime.classpath>>>
@@ -38,9 +36,7 @@
   * <<<maven.plugin.classpath>>>
   
 
- For example, in using optional ant tasks, we can set our <<<target>>>'s 
- classpath to the maven plugin's classpath, and it's output directory to 
- "target".
+ For example, to display maven's classpaths using antrun, we can do this
 
 ------
 <project>
@@ -61,9 +57,15 @@
             <phase>compile</phase>
             <configuration>
               <tasks>
-                <antlr target="calc.g" outputdirectory="target">
-                  <classpath refid="maven.plugin.classpath"/>
-                </antlr>
+                <property name="compile_classpath" refid="maven.compile.classpath"/>
+                <property name="runtime_classpath" refid="maven.runtime.classpath"/>
+                <property name="test_classpath" refid="maven.test.classpath"/>
+                <property name="plugin_classpath" refid="maven.plugin.classpath"/>
+
+                <echo message="compile classpath: ${compile_classpath}"/>
+                <echo message="runtime classpath: ${runtime_classpath}"/>
+                <echo message="test classpath:    ${test_classpath}"/>
+                <echo message="plugin classpath:  ${plugin_classpath}"/>
               </tasks>
             </configuration>
             <goals>
@@ -71,28 +73,14 @@
             </goals>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>ant</groupId>
-            <artifactId>ant-antlr</artifactId>
-            <version>1.6.5</version>
-          </dependency>
-          <dependency>
-            <groupId>antlr</groupId>
-            <artifactId>antlrall</artifactId>
-            <version>2.7.4</version>
-          </dependency>
-        </dependencies>
       </plugin>
-
     </plugins>
   </build>
 </project>
+
 ------
 
- or alternatively, we can use an external <<<build.xml>>> (<note the 
- <<<inheritRefs>>> property so the classpath references are passed to the 
- <<<build.xml>>>>)
+ or alternatively, we can use an external <<<build.xml>>>.
 
 ------
 <project>
@@ -113,7 +101,12 @@
             <phase>compile</phase>
             <configuration>
               <tasks>
-                <ant antfile="${basedir}/build.xml" inheritRefs="true">
+                <property name="compile_classpath" refid="maven.compile.classpath"/>
+                <property name="runtime_classpath" refid="maven.runtime.classpath"/>
+                <property name="test_classpath" refid="maven.test.classpath"/>
+                <property name="plugin_classpath" refid="maven.plugin.classpath"/>
+
+                <ant antfile="${basedir}/build.xml">
                   <target name="test"/>
                 </ant>
               </tasks>
@@ -123,20 +116,7 @@
             </goals>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>ant</groupId>
-            <artifactId>ant-antlr</artifactId>
-            <version>1.6.5</version>
-          </dependency>
-          <dependency>
-            <groupId>antlr</groupId>
-            <artifactId>antlrall</artifactId>
-            <version>2.7.4</version>
-          </dependency>
-        </dependencies>
       </plugin>
-
     </plugins>
   </build>
 </project>
@@ -150,9 +130,10 @@
 
     <target name="test">
 
-        <antlr target="calc.g" outputdirectory="target">
-            <classpath refid="maven.plugin.classpath"/>
-        </antlr>
+      <echo message="compile classpath: ${compile_classpath}"/>
+      <echo message="runtime classpath: ${runtime_classpath}"/>
+      <echo message="test classpath:    ${test_classpath}"/>
+      <echo message="plugin classpath:  ${plugin_classpath}"/>
 
     </target>
 

Modified: maven/plugins/trunk/maven-antrun-plugin/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/site/apt/usage.apt?rev=428603&r1=428602&r2=428603&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/site/apt/usage.apt (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/site/apt/usage.apt Thu Aug  3 20:10:22 2006
@@ -152,7 +152,7 @@
 *-----------------------------------+-----------------------------------+
 | <<<Copy>>>                        | {{{../maven-resources-plugin/}<<<maven-resources-plugin>>>}}            |
 *-----------------------------------+-----------------------------------+
-| <<<Dependset>>>                   | {{{../maven-dependencies-plugin/}<<<maven-dependencies-plugin>>>}}         |
+| <<<Dependset>>>                   | {{{../maven-dependency-plugin/}<<<maven-dependency-plugin>>>}}         |
 *-----------------------------------+-----------------------------------+
 | <<<Ear>>>                         | {{{../maven-ear-plugin/}<<<maven-ear-plugin>>>}}                  |
 *-----------------------------------+-----------------------------------+
@@ -200,7 +200,7 @@
 *-----------------------------------+-----------------------------------+
 | <<<Antlr>>>                       | {{{../maven-antlr-plugin/}<<<maven-antlr-plugin>>>}}                |
 *-----------------------------------+-----------------------------------+
-| <<<Depend>>>                      | {{{../maven-dependencies-plugin/}<<<maven-dependencies-plugin>>>}}         |
+| <<<Depend>>>                      | {{{../maven-dependency-plugin/}<<<maven-dependency-plugin>>>}}         |
 *-----------------------------------+-----------------------------------+
 | <<<EJB Tasks>>>                   | {{{../maven-ejb-plugin/}<<<maven-ejb-plugin>>>}}                  |
 *-----------------------------------+-----------------------------------+

Modified: maven/plugins/trunk/maven-antrun-plugin/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/site/fml/faq.fml?rev=428603&r1=428602&r2=428603&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/site/fml/faq.fml Thu Aug  3 20:10:22 2006
@@ -23,9 +23,7 @@
      <answer>
        <p>Maven has certain benefits over Ant. And for your ant projects to take
        advantage of these, you can use maven as your porject management tool and
-       use its maven-antrun-plugin to build your ant projects (<I>See 
-       <a href="http://maven.apache.org/start/maven-for-ant-users.html">
-       Maven for Ant Users</a> for a comparison between Maven and Ant</I>). </p>
+       use its maven-antrun-plugin to build your ant projects. </p>
        <p>Furthermore, if you wish to migrate from ant to maven, you can use 
        this plugin first, then gradually convert your ant expressions into their
        corresponding maven expressions.</p>