dion 2003/08/03 19:41:10
Modified: src/java/org/apache/maven/plugin PluginManager.java
Log:
Move ant stuff into a single method
Revision Changes Path
1.60 +7 -7 maven/src/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- PluginManager.java 4 Aug 2003 01:11:13 -0000 1.59
+++ PluginManager.java 4 Aug 2003 02:41:10 -0000 1.60
@@ -87,7 +87,6 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
-import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStreamWriter;
import java.io.PrintStream;
@@ -363,14 +362,11 @@
// Before attempting to attain the goals verify the project
// if desired.
// FIXME: From attainGoals angle, how does it know the project needs to
- // to be verified, or that the project object has
+ // to be verified, or that the project object hasn't been used before
project.verifyDependencies();
// Set up the ant project.
- GrantProject antProject = buildAntProject( project, baseContext );
- Path p = new Path( antProject );
- p.setPath( project.getDependencyClasspath() );
- antProject.addReference( MavenConstants.DEPENDENCY_CLASSPATH, p );
+ buildAntProject( project, baseContext );
Session session = getJellySession(baseContext);
@@ -635,6 +631,10 @@
context.setAntProject( antProject );
AntTagLibrary.setProject( context, antProject );
+
+ Path p = new Path( antProject );
+ p.setPath( project.getDependencyClasspath() );
+ antProject.addReference( MavenConstants.DEPENDENCY_CLASSPATH, p );
return antProject;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
