From 77f3e80ffc6fe8c8d0d03c1404761fd1ee81d6a2 Mon Sep 17 00:00:00 2001
From: dion <dion@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 14 Sep 2003 15:36:37 +0000
Subject: [PATCH] Fix bad reactored location of doclet file

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114010 13f79535-47bb-0310-9956-ffa450edef68
---
 jellydoc/plugin.jelly | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/jellydoc/plugin.jelly b/jellydoc/plugin.jelly
index 8b8799c3..f3f18278 100644
--- a/jellydoc/plugin.jelly
+++ b/jellydoc/plugin.jelly
@@ -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 -->