werken 2002/07/16 22:12:50
Modified: . project.xml
src/java/org/apache/maven/app Maven.java
src/plugins-build/xdoc plugin.jelly project.xml
src/plugins-build/xdoc/src/java/org/apache/maven
BaseProjectTask.java
Log:
Finally, you can generate the site now.
Lesson to learn:
Try not to take an Ant task, extend it, and then
not use it as an Ant task, but instead as a jellybean.
Especially troublesome if the base Ant task you
extended relies on having an o.a.t.ant.Project
available to it for doing things like resolving
paths.
Revision Changes Path
1.159 +2 -0 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- project.xml 16 Jul 2002 22:03:33 -0000 1.158
+++ project.xml 17 Jul 2002 05:12:49 -0000 1.159
@@ -453,10 +453,12 @@
</dependency>
-->
+ <!--
<dependency>
<id>velocity</id>
<version>1.4-dev</version>
</dependency>
+ -->
</dependencies>
1.71 +13 -3 jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java
Index: Maven.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- Maven.java 16 Jul 2002 22:03:10 -0000 1.70
+++ Maven.java 17 Jul 2002 05:12:49 -0000 1.71
@@ -146,6 +146,8 @@
/** Default console width - for formatting output - 78 */
private static final int CONSOLE_WIDTH = 80;
+ private static Maven INSTANCE = new Maven();
+
// ------------------------------------------------------------
// Instance members
// ------------------------------------------------------------
@@ -312,6 +314,11 @@
return this.antProject;
}
+ public org.apache.tools.ant.Project getBaseAntProject()
+ {
+ return this.antProject;
+ }
+
/**
* retrieve the werkz project object
* @return the {@link com.werken.werkz.Project Werkz Project}
@@ -1658,15 +1665,18 @@
// Class methods
// ------------------------------------------------------------
+ public static Maven getInstance()
+ {
+ return INSTANCE;
+ }
+
/** Run maven.
*
* @param args The command-line arguments.
*/
public static void main(String[] args)
{
- Maven maven = new Maven();
-
- maven.doMain(args);
+ getInstance().doMain(args);
}
}
1.4 +1 -0 jakarta-turbine-maven/src/plugins-build/xdoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/xdoc/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 17 Jul 2002 03:07:26 -0000 1.3
+++ plugin.jelly 17 Jul 2002 05:12:49 -0000 1.4
@@ -26,6 +26,7 @@
</define:taglib>
<xdoc-pom:xdoc-pom
+ project="${maven.ant.project}"
controlTemplate="Control.vm"
outputDirectory="${maven.gen.docs}"
templatePath="${plugin.dir}/templates"
1.5 +2 -2 jakarta-turbine-maven/src/plugins-build/xdoc/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/xdoc/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 17 Jul 2002 04:25:26 -0000 1.4
+++ project.xml 17 Jul 2002 05:12:49 -0000 1.5
@@ -73,7 +73,7 @@
<id>velocity</id>
<version>1.3</version>
<metaEntries>
- <metaEntry>classloader:root.maven</metaEntry>
+ <metaEntry>classloader:root</metaEntry>
</metaEntries>
</dependency>
@@ -81,7 +81,7 @@
<id>velocity-dvsl</id>
<version>SNAPSHOT</version>
<metaEntries>
- <metaEntry>classloader:root.maven</metaEntry>
+ <metaEntry>classloader:root</metaEntry>
</metaEntries>
</dependency>
1.3 +11 -1
jakarta-turbine-maven/src/plugins-build/xdoc/src/java/org/apache/maven/BaseProjectTask.java
Index: BaseProjectTask.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/plugins-build/xdoc/src/java/org/apache/maven/BaseProjectTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseProjectTask.java 17 Jul 2002 03:07:26 -0000 1.2
+++ BaseProjectTask.java 17 Jul 2002 05:12:49 -0000 1.3
@@ -58,6 +58,7 @@
import java.io.File;
+import org.apache.maven.app.Maven;
import org.apache.maven.project.Project;
import org.apache.tools.ant.BuildException;
@@ -110,6 +111,15 @@
public void setProjectDescriptor(File projectDescriptor)
{
this.projectDescriptor = projectDescriptor;
+ }
+
+ public void setTemplatePath(String templatePath) throws Exception
+ {
+ if ( getProject() == null )
+ {
+ setProject( Maven.getInstance().getBaseAntProject() );
+ }
+ super.setTemplatePath( templatePath );
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
