You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2003/09/14 17:36:37 UTC
cvs commit: maven/src/plugins-build/jellydoc plugin.jelly
dion 2003/09/14 08:36:37
Modified: src/plugins-build/jellydoc plugin.jelly
Log:
Fix bad reactored location of doclet file
Revision Changes Path
1.14 +4 -12 maven/src/plugins-build/jellydoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jellydoc/plugin.jelly,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- plugin.jelly 29 Aug 2003 06:27:53 -0000 1.13
+++ plugin.jelly 14 Sep 2003 15:36:37 -0000 1.14
@@ -30,17 +30,7 @@
<ant:mkdir dir="${genDocs}"/>
<j:file name="${genDocs}/tags.xml">
-
- <!-- the following should be way easier - j:include should support files -->
- <j:new var="file" className="java.io.File">
- <j:arg value="${plugin.resources}/${plugin.artifactId}.jelly"/>
- </j:new>
-
- <!--
- <echo>About to include ${file.toURL()}</echo>
- -->
-
- <j:include uri="${file.toURL().toString()}"/>
+ <j:include file="${plugin.resources}/${plugin.artifactId}.jelly"/>
</j:file>
</goal>
@@ -54,6 +44,7 @@
<ant:echo>Generating jellydoc for packages ${maven.jellydoc.packages}</ant:echo>
+ <!-- the doclet dumps taglib.xml into ${user.dir}/target -->
<ant:mkdir dir="target"/>
<ant:echo>Source directory is ${pom.build.sourceDirectory}</ant:echo>
@@ -67,7 +58,8 @@
</ant:javadoc>
<!-- if ran inside the reactor then lets copy the generated file -->
- <ant:copy tofile="${genDocs}/taglib.xml" file="${user.dir}/target/taglib.xml"/>
+ <!-- the doclet dumps taglib.xml into ${user.dir}/target -->
+ <ant:copy tofile="${maven.build.dir}/taglib.xml" file="${user.dir}/target/taglib.xml"/>
</goal>
<!-- runs the XML doclet -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org