jvanzyl 2002/11/30 20:34:42
Modified: src/java/org/apache/maven/jelly/tags/project MavenTag.java
Log:
refactoring
Revision Changes Path
1.18 +4 -6 jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/project/MavenTag.java
Index: MavenTag.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/project/MavenTag.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- MavenTag.java 30 Nov 2002 17:18:41 -0000 1.17
+++ MavenTag.java 1 Dec 2002 04:34:42 -0000 1.18
@@ -158,21 +158,19 @@
File basedir = new File( project.getFile().getParent() );
Maven maven = new Maven();
- maven.setProject( project );
//MavenJellyContext c = MavenUtils.createContext( basedir, parent.getContext() );
// I can't seem to do the inherit thing property as i'm picking things up
// from the parent project that i don't want when values are not present
// in the child. So i need to populate some basic values here.
MavenJellyContext c = MavenUtils.createContext( basedir );
+ c.setProject( project );
c.setXMLOutput( parent.getContext().getXMLOutput() );
c.setDebugOn( parent.getContext().getDebugOn() );
+ c.setEmacsModeOn( parent.getContext().getEmacsModeOn() );
c.setOnline( parent.getContext().getOnline() );
-
+ c.setDescriptorDirectory( basedir );
maven.setContext( c );
-
- /* @todo use the context */
- maven.setDir( basedir );
addGoals( maven );