You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/09/23 05:24:22 UTC
svn commit: r291066 - in
/maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun:
AbstractAntMojo.java AntRunMojo.java
Author: brett
Date: Thu Sep 22 20:24:18 2005
New Revision: 291066
URL: http://svn.apache.org/viewcvs?rev=291066&view=rev
Log:
add path references:
- maven.dependency.classpath (compile)
- maven.compile.classpath (compile)
- maven.runtime.classpath (runtime)
- maven.test.classpath (test)
resolve dependencies in ant run mojo to ensure these are available
Modified:
maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java
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/AbstractAntMojo.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?rev=291066&r1=291065&r2=291066&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java Thu Sep 22 20:24:18 2005
@@ -23,6 +23,10 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.PropertyHelper;
import org.apache.tools.ant.Target;
+import org.apache.tools.ant.types.Path;
+import org.codehaus.plexus.util.StringUtils;
+
+import java.io.File;
/**
* @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
@@ -50,6 +54,17 @@
antTasks.getProject().addBuildListener( antLogger );
antTasks.getProject().setBaseDir( mavenProject.getBasedir() );
+
+ Path p = new Path( antTasks.getProject() );
+ p.setPath( StringUtils.join( mavenProject.getCompileClasspathElements().iterator(), File.pathSeparator ) );
+ antTasks.getProject().addReference( "maven.dependency.classpath", p );
+ antTasks.getProject().addReference( "maven.compile.classpath", p );
+ p = new Path( antTasks.getProject() );
+ p.setPath( StringUtils.join( mavenProject.getRuntimeClasspathElements().iterator(), File.pathSeparator ) );
+ antTasks.getProject().addReference( "maven.runtime.classpath", p );
+ p = new Path( antTasks.getProject() );
+ p.setPath( StringUtils.join( mavenProject.getTestClasspathElements().iterator(), File.pathSeparator ) );
+ antTasks.getProject().addReference( "maven.test.classpath", p );
getLog().info( "Executing 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=291066&r1=291065&r2=291066&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 Thu Sep 22 20:24:18 2005
@@ -38,7 +38,8 @@
* @goal run
*
* @description Runs the nested ant tasks
- *
+ *
+ * @requiresDependencyResolution
*/
public class AntRunMojo
extends AbstractAntMojo
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org