jvanzyl 2002/07/16 20:07:26
Modified: src/plugins-build/xdoc plugin.jelly
src/plugins-build/xdoc/src/java/org/apache/maven
BaseProjectTask.java
Log:
o converting to using jelly instead of ant.
Revision Changes Path
1.3 +13 -6 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 16 Jul 2002 22:00:38 -0000 1.2
+++ plugin.jelly 17 Jul 2002 03:07:26 -0000 1.3
@@ -1,6 +1,9 @@
<?xml version="1.0"?>
-<project xmlns:j="jelly:core" xmlns:log="jelly:log">
+<project xmlns:j="jelly:core"
+ xmlns:log="jelly:log"
+ xmlns:define="jelly:define"
+ xmlns:xdoc-pom="xdoc-pom">
<!-- ================================================================== -->
<!-- P R O J E C T D O C U M E N T A T I O N -->
@@ -14,17 +17,21 @@
name="xdoc:generate-from-pom"
description="Generates xdocs for site based on project descriptor">
- <taskdef
- name="create-xdocs"
- classname="org.apache.maven.BaseProjectTask">
- </taskdef>
+ <define:taglib uri="xdoc-pom">
+ <define:jellybean
+ name="xdoc-pom"
+ className="org.apache.maven.BaseProjectTask"
+ method="doExecute"
+ />
+ </define:taglib>
- <create-xdocs
+ <xdoc-pom:xdoc-pom
controlTemplate="Control.vm"
outputDirectory="${maven.gen.docs}"
templatePath="${plugin.dir}/templates"
outputFile="xdocs.report"
projectDescriptor="project.xml"
+ mavenProject="${pom}"
/>
</goal>
1.2 +12 -2
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseProjectTask.java 16 Jul 2002 22:00:38 -0000 1.1
+++ BaseProjectTask.java 17 Jul 2002 03:07:26 -0000 1.2
@@ -93,6 +93,16 @@
*/
private Project mavenProject;
+ public void setMavenProject(Project mavenProject)
+ {
+ this.mavenProject = mavenProject;
+ }
+
+ public Project getMavenProject()
+ {
+ return mavenProject;
+ }
+
/**
* Set the project descriptor file. This file must exist.
* @param projectDescriptor the project descriptor file
@@ -115,7 +125,7 @@
try
{
- mavenProject = MavenUtils.getProject(projectDescriptor);
+ //mavenProject = MavenUtils.getProject(projectDescriptor);
context.put("project", mavenProject);
context.put("escape", new Escape());
return context;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
