From 75b0cb84d3275052e82af7de405fb5e865516559 Mon Sep 17 00:00:00 2001
From: jstrachan <jstrachan@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 8 Feb 2003 11:40:25 +0000
Subject: [PATCH] Patch to fix the jellydoc plugin so that it actually works on
 other projects :-). This patch not only removes the oodles of wraning
 messages that jellydoc was causing but also it now manages to find some tags
 now! :-) The main issue was that the Jelly library wasn't on the classpath
 and so the tag inheritence/interface implementation couldn't be found and so
 no tags were found. Now fixed

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@112859 13f79535-47bb-0310-9956-ffa450edef68
---
 jellydoc/plugin.jelly                                  |  7 +++----
 .../main/org/apache/maven/jellydoc/TagXMLDoclet.java   | 10 +++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/jellydoc/plugin.jelly b/jellydoc/plugin.jelly
index 4de63b17..2c101df9 100644
--- a/jellydoc/plugin.jelly
+++ b/jellydoc/plugin.jelly
@@ -45,15 +45,12 @@
     <javadoc
       sourcepath="${basedir}/${pom.build.sourceDirectory}"
       packagenames="${maven.jellydoc.packages}"
+      classpathref="doclet.classpath"
       docletpathref="doclet.classpath"
       doclet="org.apache.maven.jellydoc.TagXMLDoclet">
     </javadoc>
 
 		<!-- if ran inside the reactor then lets copy the generated file -->
-		<j:new var="file" className="java.io.File">
-			<j:arg value="target/taglib.xml"/>
-		</j:new>
-		
 		<copy tofile="${maven.build.dir}/taglib.xml" file="${user.dir}/target/taglib.xml"/>
   </goal>
 
@@ -64,6 +61,7 @@
     <javadoc
       sourcepath="${basedir}/${pom.build.sourceDirectory}"
       packagenames="${pom.package}.*"
+      classpathref="doclet.classpath"
       docletpathref="doclet.classpath"
       doclet="org.apache.maven.jellydoc.XMLDoclet">
     </javadoc>
@@ -85,6 +83,7 @@
       <pathelement path="${plugin.getDependencyPath('dom4j')}"/>
       <pathelement path="${plugin.getDependencyPath('xerces')}"/>
       <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
+      <pathelement path="${plugin.getDependencyPath('commons-jelly')}"/>
     </path>
   </goal>
 
diff --git a/jellydoc/src/main/org/apache/maven/jellydoc/TagXMLDoclet.java b/jellydoc/src/main/org/apache/maven/jellydoc/TagXMLDoclet.java
index 3f091f35..0ef52b4a 100644
--- a/jellydoc/src/main/org/apache/maven/jellydoc/TagXMLDoclet.java
+++ b/jellydoc/src/main/org/apache/maven/jellydoc/TagXMLDoclet.java
@@ -108,9 +108,6 @@ public class TagXMLDoclet extends Doclet {
 
     public TagXMLDoclet (RootDoc root) throws Exception {
         
-        System.err.println( "basedir: " + System.getProperty("basedir"));
-        System.err.println( "user.dir: " + System.getProperty("user.dir"));
-        
         FileOutputStream writer = new FileOutputStream(targetFileName);
         OutputFormat format = OutputFormat.createPrettyPrint();
         XMLWriter xmlWriter = new XMLWriter(writer, format);
@@ -146,6 +143,9 @@ public class TagXMLDoclet extends Doclet {
      * Generates doc for a tag library
      */
     private void packageXML(PackageDoc packageDoc) throws SAXException {
+        
+        System.out.println( "processing package: " + packageDoc.name());
+        
         ClassDoc[] classArray = packageDoc.ordinaryClasses();
         
         // lets see if we find a Tag
@@ -158,6 +158,7 @@ public class TagXMLDoclet extends Doclet {
             }
         }
         if ( ! foundTag ) {
+            System.out.println( "no tags found");
             return;
         }
         
@@ -222,6 +223,9 @@ public class TagXMLDoclet extends Doclet {
         }
         name = Introspector.decapitalize(name);
         
+        
+        System.out.println( "processing tag: " + name);
+
         atts.addAttribute(xmlns, localName, "name", "String", name);
         cm.startElement(xmlns, localName, "tag", atts);