unchanged:
--- Makefile.am	29 Sep 2004 19:45:54 -0000	1.1
+++ Makefile.am	25 Nov 2004 00:50:07 -0000
@@ -19,7 +19,7 @@ gjdoc_SOURCES =
 gjdoc_LINK = $(GCJLINK)
 gjdoc_LDADD = -l-com-sun-javadoc -l-com-sun-tools-doclets-Taglet \
 	-l-gnu-classpath-tools-gjdoc \
-	-l-javax-xml-transform -l-javax-xml-parsers -lxmlj
+	-l-gnu-xml -lxmlj
 gjdoc_LDFLAGS = --main=gnu.classpath.tools.gjdoc.Main
 
 lib_com_sun_javadoc_la_SOURCES = \
@@ -39,6 +39,7 @@ lib_com_sun_javadoc_la_SOURCES = \
 	src/com/sun/javadoc/RootDoc.java \
 	src/com/sun/javadoc/SeeTag.java \
 	src/com/sun/javadoc/SerialFieldTag.java \
+	src/com/sun/javadoc/SourcePosition.java \
 	src/com/sun/javadoc/Tag.java \
 	src/com/sun/javadoc/ThrowsTag.java \
 	src/com/sun/javadoc/Type.java
@@ -47,50 +48,61 @@ lib_com_sun_tools_doclets_Taglet_la_SOUR
 	src/com/sun/tools/doclets/Taglet.java
 
 lib_gnu_classpath_tools_gjdoc_la_SOURCES = \
-	src/gnu/classpath/tools/taglets/CopyrightTaglet.java \
-	src/gnu/classpath/tools/doclets/xmldoclet/FileSystemClassLoader.java \
 	src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java \
+	src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java \
+	src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java \
+	src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java \
 	src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java \
 	src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java \
-	src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java \
-	src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java \
 	src/gnu/classpath/tools/doclets/xmldoclet/Driver.java \
 	src/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java \
-	src/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java \
+	src/gnu/classpath/tools/doclets/xmldoclet/FileSystemClassLoader.java \
 	src/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java \
-	src/gnu/classpath/tools/gjdoc/ThrowsTagImpl.java \
+	src/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java \
+	src/gnu/classpath/tools/gjdoc/AbstractTagImpl.java \
 	src/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.java \
-	src/gnu/classpath/tools/gjdoc/ParseException.java \
-	src/gnu/classpath/tools/gjdoc/FieldDocImpl.java \
+	src/gnu/classpath/tools/gjdoc/ClassDocImpl.java \
 	src/gnu/classpath/tools/gjdoc/ClassDocProxy.java \
-	src/gnu/classpath/tools/gjdoc/MemberDocImpl.java \
-	src/gnu/classpath/tools/gjdoc/TimerDoclet.java \
-	src/gnu/classpath/tools/gjdoc/MethodDocImpl.java \
-	src/gnu/classpath/tools/gjdoc/Parser.java \
 	src/gnu/classpath/tools/gjdoc/ConstructorDocImpl.java \
-	src/gnu/classpath/tools/gjdoc/ParamTagImpl.java \
-	src/gnu/classpath/tools/gjdoc/ClassDocImpl.java \
-	src/gnu/classpath/tools/gjdoc/RootDocImpl.java \
-	src/gnu/classpath/tools/gjdoc/ParameterImpl.java \
-	src/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java \
-	src/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.java \
-	src/gnu/classpath/tools/gjdoc/AbstractTagImpl.java \
+	src/gnu/classpath/tools/gjdoc/Debug.java \
 	src/gnu/classpath/tools/gjdoc/DirectoryTree.java \
-	src/gnu/classpath/tools/gjdoc/JavadocWrapper.java \
+	src/gnu/classpath/tools/gjdoc/DocImpl.java \
+	src/gnu/classpath/tools/gjdoc/ErrorReporter.java \
 	src/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java \
+	src/gnu/classpath/tools/gjdoc/FieldDocImpl.java \
+	src/gnu/classpath/tools/gjdoc/GjdocPackageDoc.java \
+	src/gnu/classpath/tools/gjdoc/GjdocRootDoc.java \
+	src/gnu/classpath/tools/gjdoc/JavadocWrapper.java \
 	src/gnu/classpath/tools/gjdoc/LinkTagImpl.java \
-	src/gnu/classpath/tools/gjdoc/TextTagImpl.java \
+	src/gnu/classpath/tools/gjdoc/Main.java \
+	src/gnu/classpath/tools/gjdoc/MemberDocImpl.java \
+	src/gnu/classpath/tools/gjdoc/MethodDocImpl.java \
 	src/gnu/classpath/tools/gjdoc/PackageDocImpl.java \
-	src/gnu/classpath/tools/gjdoc/TypeImpl.java \
-	src/gnu/classpath/tools/gjdoc/ErrorReporter.java \
-	src/gnu/classpath/tools/gjdoc/Timer.java \
+	src/gnu/classpath/tools/gjdoc/ParamTagImpl.java \
+	src/gnu/classpath/tools/gjdoc/ParameterImpl.java \
+	src/gnu/classpath/tools/gjdoc/ParseException.java \
+	src/gnu/classpath/tools/gjdoc/Parser.java \
+	src/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.java \
+	src/gnu/classpath/tools/gjdoc/RootDocImpl.java \
 	src/gnu/classpath/tools/gjdoc/SeeTagImpl.java \
-	src/gnu/classpath/tools/gjdoc/Main.java \
-	src/gnu/classpath/tools/gjdoc/DocImpl.java \
-	src/gnu/classpath/tools/gjdoc/Debug.java \
-	src/gnu/classpath/tools/gjdoc/TemporaryStore.java \
+	src/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java \
+	src/gnu/classpath/tools/gjdoc/SourcePositionImpl.java \
 	src/gnu/classpath/tools/gjdoc/TagImpl.java \
-	src/gnu/classpath/tools/gjdoc/WritableType.java
+	src/gnu/classpath/tools/gjdoc/TemporaryStore.java \
+	src/gnu/classpath/tools/gjdoc/TextTagImpl.java \
+	src/gnu/classpath/tools/gjdoc/ThrowsTagImpl.java \
+	src/gnu/classpath/tools/gjdoc/Timer.java \
+	src/gnu/classpath/tools/gjdoc/TimerDoclet.java \
+	src/gnu/classpath/tools/gjdoc/TypeImpl.java \
+	src/gnu/classpath/tools/gjdoc/WritableType.java \
+	src/gnu/classpath/tools/java2xhtml/Java2xhtml.java \
+	src/gnu/classpath/tools/taglets/AuthorTaglet.java \
+	src/gnu/classpath/tools/taglets/CopyrightTaglet.java \
+	src/gnu/classpath/tools/taglets/DeprecatedTaglet.java \
+	src/gnu/classpath/tools/taglets/GenericTaglet.java \
+	src/gnu/classpath/tools/taglets/SinceTaglet.java \
+	src/gnu/classpath/tools/taglets/VersionTaglet.java
+
 lib_gnu_classpath_tools_gjdoc_la_LIBADD = \
 	$(lib_gnu_classpath_tools_gjdoc_la_CSS) \
 	$(lib_gnu_classpath_tools_gjdoc_la_DTDS) \
unchanged:
--- configure.ac	29 Sep 2004 19:45:54 -0000	1.1
+++ configure.ac	25 Nov 2004 00:50:07 -0000
@@ -17,12 +17,12 @@ dnl Check if javax.xml.transform.Transfo
 dnl ... if it is, continue; if not, check if gnujaxp.jar is available and
 dnl prepend that to the CLASSPATH.  If gnujaxp.jar is not available, fail.
 
-AC_CHECK_FILE([/usr/share/java/gnujaxp.jar],
+AC_CHECK_FILE([/usr/local/share/java/gnujaxp.jar],
   if test -z $CLASSPATH
   then
-    export CLASSPATH=/usr/share/java/gnujaxp.jar
+    export CLASSPATH=/usr/local/share/java/gnujaxp.jar
   else
-    export CLASSPATH=/usr/share/java/gnujaxp.jar:$CLASSPATH
+    export CLASSPATH=/usr/local/share/java/gnujaxp.jar:$CLASSPATH
   fi
 )
 
only in patch2:
unchanged:
--- src/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java	24 Feb 2002 02:47:34 -0000	1.2
+++ src/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java	25 Nov 2004 00:50:07 -0000
@@ -20,6 +20,8 @@ Free Software Foundation, Inc., 59 Templ
 
 package gnu.classpath.tools.doclets.xmldoclet;
 
+import java.io.IOException;
+
 import com.sun.javadoc.*;
 
 /**
@@ -52,8 +54,13 @@ public class Driver1_4 extends Driver {
    */
 
    protected void outputClassDoc(ClassDoc classDoc) {
-      super.outputClassDoc(classDoc);
-      //outputSourcePosition(level, doc.position());
+         try {
+             super.outputClassDoc(classDoc);
+             //outputSourcePosition(level, doc.position());
+         } catch (IOException e) {
+             // TODO Auto-generated catch block
+             e.printStackTrace();
+         }
    }
 
    protected void outputFieldDocBody(int level, FieldDoc fieldDoc) {
only in patch2:
unchanged:
--- src/gnu/classpath/tools/gjdoc/ClassDocProxy.java	12 Oct 2004 22:50:57 -0000	1.5
+++ src/gnu/classpath/tools/gjdoc/ClassDocProxy.java	25 Nov 2004 00:50:07 -0000
@@ -107,7 +107,8 @@ public class ClassDocProxy implements Cl
    public boolean isInterface() { return false; } 
    public boolean isMethod() { return false; } 
    public boolean isOrdinaryClass() { return false; } 
-   public String name() { return name; } 
+   public String name() { return name; }
+   public SourcePosition position() { return null; }
    public SeeTag[] seeTags() { return new SeeTag[0]; } 
    public void setRawCommentText(java.lang.String rawDocumentation) {} 
    public Tag[] tags() { return new Tag[0]; }