re PR libgcj/37636 (java tools are unable to find resource files)

libjava/ChangeLog: 2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org> * sources.am, Makfile.in: Regenerate. 2008-10-17 Matthias Klose <doko@ubuntu.com> * configure.ac: Fix bashisms. * configure: Regenerate. 2008-10-15 Matthias Klose <doko@ubuntu.com> * configure.ac: Disable build of gjdoc, if configured without --with-antlr-jar or if no antlr.jar found. * configure: Regenerate. 2008-10-09 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/configure.ac, * classpath/m4/ac_prog_antlr.m4, * classpath/m4/ac_prog_java.m4, * classpath/tools/Makefile.am: Ported --regen-gjdoc-parser patch and cantlr support from GNU Classpath. 2008-10-06 Andrew Haley <aph@redhat.com> * java/lang/Thread.java (Thread): Always create the ThreadLocalMap when creating a thread. (getThreadLocals) Don't lazily create the ThreadLocalMap. 2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/java/lang/ThreadLocalMap.java, * java/lang/ThreadLocalMap$Entry.h, * java/lang/ThreadLocalMap.h, * lib/java/lang/ThreadLocalMap.class, * lib/java/lang/ThreadLocalMap$Entry.class: Add the new files for the ThreadLocal patch. 2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/ChangeLog, * classpath/java/lang/InheritableThreadLocal.java, * classpath/java/lang/Thread.java, * classpath/java/lang/ThreadLocal.java: Merge Daniel Frampton's ThreadLocal patch. * gcj/javaprims.h: Updated. * java/lang/Thread.h: Regenerated. * java/lang/Thread.java: Replace WeakIdentityHashMap with ThreadLocalMap. (getThreadLocals()): Likewise. * java/lang/ThreadLocal.h: Regenerated. * java/lang/ThreadLocal.java: (computeNextHash()): New method. (ThreadLocal()): Initialise fastHash. (internalGet()): Updated to match Classpath's get(). (internalSet(Object)): Likewise for set(Object). (internalRemove()): Likewise for remove(). 2008-09-25 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/configure, * classpath/configure.ac: Resynchronise with Classpath's configure. * classpath/examples/Makefile.in: Add equivalent support for building as in tools/Makefile.in. * classpath/java/nio/Buffer.java, * classpath/java/nio/ByteBuffer.java, * classpath/java/nio/ByteBufferImpl.java, * classpath/java/nio/CharBuffer.java, * classpath/java/nio/CharBufferImpl.java, * classpath/java/nio/CharSequenceBuffer.java, * classpath/java/nio/CharViewBufferImpl.java, * classpath/java/nio/DirectByteBufferImpl.java, * classpath/java/nio/DoubleBuffer.java, * classpath/java/nio/DoubleBufferImpl.java, * classpath/java/nio/DoubleViewBufferImpl.java, * classpath/java/nio/FloatBuffer.java, * classpath/java/nio/FloatBufferImpl.java, * classpath/java/nio/FloatViewBufferImpl.java, * classpath/java/nio/IntBuffer.java, * classpath/java/nio/IntBufferImpl.java, * classpath/java/nio/IntViewBufferImpl.java, * classpath/java/nio/LongBuffer.java, * classpath/java/nio/LongBufferImpl.java, * classpath/java/nio/LongViewBufferImpl.java, * classpath/java/nio/MappedByteBuffer.java, * classpath/java/nio/MappedByteBufferImpl.java, * classpath/java/nio/ShortBuffer.java, * classpath/java/nio/ShortBufferImpl.java, * classpath/java/nio/ShortViewBufferImpl.java: Replace use of gnu.classpath.Pointer with gnu.gcj.RawData, and fix some formatting issues. * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt: Regenerated (later version of antlr). * java/nio/Buffer.h: Regenerated. * java/nio/Buffer.java: Ported changes from Classpath. * java/nio/ByteBuffer.h, * java/nio/CharBuffer.h: Regenerated. * java/nio/DirectByteBufferImpl.java: Ported changes from Classpath. * java/nio/DoubleBuffer.h, * java/nio/FloatBuffer.h, * java/nio/IntBuffer.h, * java/nio/LongBuffer.h, * java/nio/MappedByteBuffer.h, * java/nio/MappedByteBufferImpl.h: Regenerated. * java/nio/MappedByteBufferImpl.java: Ported changes from Classpath. * java/nio/ShortBuffer.h: Regenerated. 2008-09-24 Matthias Klose <doko@ubuntu.com> * configure.ac: Search for antlr.jar, if not configured. * configure: Regenerate. 2008-09-24 Matthias Klose <doko@ubuntu.com> * Makefile.am: Build a gjdoc binary, if enabled. * configure.ac: Add options --disable-gjdoc, --with-antlr-jar=file. * Makefile.in, */Makefile.in, configure: Regenerate. 2008-09-22 Andrew Haley <aph@redhat.com> * java/lang/String.java (toString(char[], int, int)): New method. 2008-09-14 Matthias Klose <doko@ubuntu.com> Import GNU Classpath (libgcj-import-20080914). * Regenerate class and header files. * Regenerate auto* files. * configure.ac: Don't pass --disable-gjdoc to classpath. * sources.am: Regenerated. * HACKING: Mention to build gjdoc in maintainer builds. * gnu/classpath/Configuration.java: Update classpath version. * gcj/javaprims.h: Update. 2008-09-08 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.am: Replace natStringBuffer.cc and natStringBuilder.cc with natAbstractStringBuffer.cc. * Makefile.in: Regenerated. * java/lang/AbstractStringBuffer.java: (append(int)): Made native. (regionMatches(int,String)): Likewise. * java/lang/StringBuffer.h: Regenerated. * java/lang/StringBuffer.java: Remerged with GNU Classpath. * java/lang/StringBuilder.h: Regenerated. * java/lang/StringBuilder.java: Remerged with GNU Classpath. * java/lang/natAbstractStringBuffer.cc: Provide common native methods for StringBuffer and StringBuilder. * java/lang/natStringBuffer.cc, * java/lang/natStringBuilder.cc: Removed. 2008-09-04 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.in, * classpath/configure: Regenerated. * gnu/gcj/util/natDebug.cc, * gnu/gcj/xlib/natColormap.cc, * gnu/gcj/xlib/natDisplay.cc, * gnu/gcj/xlib/natDrawable.cc, * gnu/gcj/xlib/natFont.cc, * gnu/gcj/xlib/natWMSizeHints.cc, * gnu/gcj/xlib/natWindow.cc, * gnu/gcj/xlib/natXImage.cc: Add :: prefix to namespaces. * java/io/CharArrayWriter.h, * java/lang/StringBuffer.h: Regenerated using patched gjavah. * java/lang/natStringBuffer.cc: Fix naming of append(jint). * java/sql/Timestamp.h: Regenerated using patched gjavah. * jni.cc: Rename p to functions to match change in GNU Classpath. * scripts/makemake.tcl: Switch gnu.java.math to BC compilation. * sources.am: Regenerated. 2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.in: Updated location of Configuration.java. * classpath/lib/gnu/java/locale/LocaleData.class: Regenerated. 2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.in: Updated with new Java files. * classpath/configure: Regenerated. * classpath/tools/Makefile.am: Add missing use of GJDOC_EX so --disable-gjdoc works. * classpath/tools/Makefile.in: Regenerated. 2008-08-15 Matthias Klose <doko@ubuntu.com> Import GNU Classpath (libgcj-import-20080811). * Regenerate class and header files. * Regenerate auto* files. * configure.ac: Don't pass --with-fastjar to classpath, substitute new dummy value in classpath/gnu/classpath/Configuration.java.in, pass --disable-gjdoc to classpath. * scripts/makemake.tcl: * sources.am: Regenerated. * java/lang/AbstractStringBuffer.java, gnu/java/lang/VMCPStringBuilder.java: New, copied from classpath, use System instead of VMSystem. * java/lang/StringBuffer.java: Merge from classpath. * java/lang/ClassLoader.java: Merge from classpath. * gcj/javaprims.h: Update class definitions, remove _Jv_jobjectRefType, jobjectRefType definitions. libjava/classpath/ChangeLog.gcj: 2008-10-21 Matthias Klose <doko@ubuntu.com> * classpath/tools/gnu/classpath/tools/gjdoc/expr/Java*: Move from ... * classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/ ... here. * Update .class files. 2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/Makefile.am: Always generate parser in the srcdir. 2008-10-21 Matthias Klose <doko@ubuntu.com> * doc/Makefile.am (MAINTAINERCLEANFILES): Add gjdoc.1. * doc/Makefile.in: Regenerate. 2008-10-20 Matthias Klose <doko@ubuntu.com> * configure.ac: Don't check for working java, if not configured with --enable-java-maintainer-mode. * configure: Regenerate. 2008-10-19 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_java.m4: Revert previous change. * m4/ac_prog_javac.m4: Apply it here. * configure: Regenerate. 2008-10-19 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_javac.m4: Don't check for working javac, if not configured with --enable-java-maintainer-mode. * configure: Regenerate. * Makefile.in, */Makefile.in: Regenerate. 2008-09-30 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_antlr.m4: Check for cantlr binary as well. 2008-09-29 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_antlr.m4: Check for antlr binary as well. 2008-09-28 Matthias Klose <doko@ubuntu.com> * PR libgcj/37636. Revert: 2008-02-20 Matthias Klose <doko@ubuntu.com> * tools/Makefile.am ($(TOOLS_ZIP)): Revert part of previous change, Do copy resource files in JAVA_MAINTAINER_MODE only. * tools/Makefile.in: Regenerate. 2008-09-14 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_javac_works.m4, m4/ac_prog_javac.m4, m4/acinclude.m4: Revert local changes. * m4/ac_prog_antlr.m4: Check for an runantlr binary. * tools/Makefile.am, lib/Makefile.am: Revert local changes (JCOMPILER). * tools/Makefile.am: Remove USE_JAVAC_FLAGS, pass ANTLR_JAR in GLIBJ_CLASSPATH. 2008-09-14 Matthias Klose <doko@ubuntu.com> Revert: Daniel Frampton <zyridium at zyridium.net> * AUTHORS: Added. * java/lang/InheritableThreadLocal.java, * java/lang/Thread.java, * java/lang/ThreadLocal.java: Modified to use java.lang.ThreadLocalMap. * java/lang/ThreadLocalMap.java: New cheaper ThreadLocal-specific WeakHashMap. 2008-08-15 Matthias Klose <doko@ubuntu.com> * m4/acinclude.m4 (CLASSPATH_JAVAC_MEM_CHECK): Remove unknown args for javac. libjava/classpath/ChangeLog: 2008-10-20 Andrew John Hughes <gnu_andrew@member.fsf.org> * m4/ac_prog_antlr.m4: Remove redundant checks. * tools/Makefile.am: Use gjdoc_gendir when calling antlr. 2008-10-15 Andrew John Hughes <gnu_andrew@member.fsf.org> * configure.ac: Remove superfluous AC_PROG_JAVA call. 2008-10-06 Andrew John Hughes <gnu_andrew@member.fsf.org> * m4/ac_prog_antlr: Check for cantlr as well. * tools/Makefile.am: Only build GJDoc parser when both CREATE_GJDOC and CREATE_GJDOC_PARSER are on. 2008-10-02 Andrew John Hughes <gnu_andrew@member.fsf.org> * configure.ac: Add regen-gjdoc-parser option, and separate antlr tests. * m4/ac_prog_antlr.m4: Turn single test into AC_LIB_ANTLR and AC_PROG_ANTLR. * m4/ac_prog_java.m4: Quote tests. * tools/Makefile.am: Support CREATE_GJDOC_PARSER option. 2008-09-14 Andrew John Hughes <gnu_andrew@member.fsf.org> * examples/Makefile.am: Check lib directly as well as glibj.zip for boot classes. * m4/acinclude.m4: Only require the class files to be built to allow the tools and examples to be built, not the installation of glibj.zip. * tools/Makefile.am: Check lib directly as well as glibj.zip for boot classes. 2008-09-13 Andrew John Hughes <gnu_andrew@member.fsf.org> * examples/Makefile.am, * lib/Makefile.am: Add GCJ rules. * m4/ac_prog_javac.m4: Check whether JAVAC is gcj. * m4/ac_prog_javac_works.m4: Add GCJ rules. * m4/acinclude.m4: Don't bother checking for -J if using GCJ. * tools/Makefile.am: Add GCJ rules. 2007-08-23 Daniel Frampton <zyridium@zyridium.net> * AUTHORS: Added. * java/lang/InheritableThreadLocal.java, * java/lang/Thread.java, * java/lang/ThreadLocal.java: Modified to use java.lang.ThreadLocalMap. * java/lang/ThreadLocalMap.java: New cheaper ThreadLocal-specific WeakHashMap. 2008-02-07 Ian Rogers <ian.rogers@manchester.ac.uk> * java/util/zip/ZipEntry.java: Use byte fields instead of integer fields, store the time as well as the DOS time and don't retain a global Calendar instance. (setDOSTime(int)): Set KNOWN_DOSTIME instead of KNOWN_TIME, and unset KNOWN_TIME. (getDOSTime()): Compute DOS time from UNIX time only when needed. (clone()): Provide cloning via the ZipEntry constructor where possible. (setTime(long)): Don't compute DOS time at this point. (getCalendar()): Removed. 2008-09-09 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/gnu/classpath/tools/getopt/Parser.java: (setHeader(String)): Make synchronized. (setFooter(String)): Likewise. * tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java, (reset()): Make synchronized. (name(Class)): Likewise. 2008-09-04 Robert Schuster <robertschuster@fsfe.org> * gnu/java/nio/charset/ByteDecodeLoopHelper: (arrayDecodeLoop): Added new break label, escape to that label. * gnu/java/nio/charset/ByteEncodeLoopHelper: (arrayDecodeLoop): Added new break label, escape to that label. 2008-09-04 Robert Schuster <robertschuster@fsfe.org> * java/text/DecimalFormat.java: (scanFix): Use 'i + 1' when looking at following character. (scanNegativePattern): Dito. 2008-09-02 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/gnu/classpath/tools/javah/ClassWrapper.java: (makeVtable()): Populate methodNameMap. (printMethods(CniPrintStream)): Always use pre-populated methodNameMap for bridge targets. 2008-09-01 Mario Torre <neugens@aicas.com> * gnu/java/awt/peer/x/XImage.java (XImageProducer): remove @Override annotation to allow compilation on javac < 1.6 and ecj < 3.4. 2008-09-01 Mario Torre <neugens@aicas.com> * gnu/java/awt/peer/x/XGraphicsDevice.java (getDisplay): fix to support new Escher API. * gnu/java/awt/peer/x/XImage.java (getSource): method implemented. * gnu/java/awt/peer/x/XImage.java (XImageProducer): implement ImageProducer for getSource. 2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/java/util/regex/BacktrackStack.java, * gnu/java/util/regex/CharIndexed.java, * gnu/java/util/regex/CharIndexedCharArray.java, * gnu/java/util/regex/CharIndexedCharSequence.java, * gnu/java/util/regex/CharIndexedInputStream.java, * gnu/java/util/regex/CharIndexedString.java, * gnu/java/util/regex/CharIndexedStringBuffer.java, * gnu/java/util/regex/RE.java, * gnu/java/util/regex/REException.java, * gnu/java/util/regex/REFilterInputStream.java, * gnu/java/util/regex/REMatch.java, * gnu/java/util/regex/REMatchEnumeration.java, * gnu/java/util/regex/RESyntax.java, * gnu/java/util/regex/REToken.java, * gnu/java/util/regex/RETokenAny.java, * gnu/java/util/regex/RETokenBackRef.java, * gnu/java/util/regex/RETokenChar.java, * gnu/java/util/regex/RETokenEnd.java, * gnu/java/util/regex/RETokenEndOfPreviousMatch.java, * gnu/java/util/regex/RETokenEndSub.java, * gnu/java/util/regex/RETokenIndependent.java, * gnu/java/util/regex/RETokenLookAhead.java, * gnu/java/util/regex/RETokenLookBehind.java, * gnu/java/util/regex/RETokenNamedProperty.java, * gnu/java/util/regex/RETokenOneOf.java, * gnu/java/util/regex/RETokenPOSIX.java, * gnu/java/util/regex/RETokenRange.java, * gnu/java/util/regex/RETokenRepeated.java, * gnu/java/util/regex/RETokenStart.java, * gnu/java/util/regex/RETokenWordBoundary.java, * gnu/java/util/regex/UncheckedRE.java: Fix indentation. 2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/java/util/regex/RETokenStart.java: (getMaximumLength()): Add Override annotation. (matchThis(CharIndexed, REMatch)): Likewise. (returnsFixedLengthMatches()): Renamed from returnsFixedLengthmatches and added Override annotation. (findFixedLengthMatches(CharIndexed,REMatch,int)): Add Override annotation. (dump(CPStringBuilder)): Likewise. * gnu/javax/print/ipp/IppRequest.java: (RequestWriter.writeOperationAttributes(AttributeSet)): Throw exception, don't just create and drop it. * javax/management/MBeanServerPermission.java: (MBeanServerPermissionCollection.add(Permission)): Compare against individual Strings not the entire array, and store the result of replace. * javax/swing/text/html/StyleSheet.java: (setBaseFontSize(size)): Store result of trim(). 2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/tools/FileObject.java: (openReader(boolean)): Document new parameter. 2008-03-27 Michael Franz <mvfranz@gmail.com> PR classpath/35690: * javax/tools/FileObject.java: (toUri()): Fix case from toURI. (openReader(boolean)): Add missing boolean argument. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/35487: * gnu/javax/management/Server.java: (beans): Change to ConcurrentHashMap. (defaultDomain): Make final. (outer): Likewise. (LazyListenersHolder): Added to wrap listeners, also now a ConcurrentHashMap, providing lazy initialisation safely. (sequenceNumber): Documented. (getBean(ObjectName)): Remove redundant cast. (addNotificationListener(ObjectName,NotificationListener, NotificationFilter,Object)): Remove map initialisation and use holder. (getObjectInstance(ObjectName)): Remove redundant cast. (registerMBean(Object,ObjectName)): Add bean atomically. (removeNotificationListener(ObjectName,NotificationListener)): Simplified. (removeNotificationListener(ObjectName,NotificationListener, NotificationFilter,Object)): Likewise. (notify(ObjectName,String)): Documented. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/javax/management/Server.java: Genericised. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/javax/management/Translator.java: Genericised. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/management/DefaultLoaderRepository.java, * javax/management/JMX.java, * javax/management/MBeanAttributeInfo.java, * javax/management/MBeanConstructorInfo.java, * javax/management/MBeanOperationInfo.java, * javax/management/MBeanServerDelegate.java: Fix warnings due to generics. 2008-08-25 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/management/MBeanPermission.java, * javax/management/MBeanServerDelegate.java, * javax/management/MBeanServerFactory.java, * javax/management/MBeanServerInvocationHandler.java, * javax/management/MBeanServerPermission.java: Fix warnings due to use of non-generic collections. 2008-08-25 Mario Torre <neugens@aicas.com> * gnu/javax/rmi/CORBA/RmiUtilities.java (readValue): check if sender is null to avoid NPE. 2008-08-22 Mario Torre <neugens@aicas.com> * gnu/CORBA/OrbFunctional.java (set_parameters): Fix NullPointerException checking when param is null. 2008-08-23 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/util/regex/Matcher.java: (reset()): Reset append position so we don't try and append to the end of the old input. 2008-08-22 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/32028: * m4/acinclude.m4: Also allow versions of GJDoc from 0.8* on, as CVS is 0.8.0-pre. 2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/32028: * m4/acinclude.m4: (CLASSPATH_WITH_GJDOC): Ensure version 0.7.9 is being used. 2008-08-20 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/Makefile.am: Add taglets subdirectory to list of excluded paths when GJDoc is not compiled. 2008-08-19 David P Grove <groved@us.ibm.com> * scripts/check_jni_methods.sh.in: Fix build issue on AIX by splitting generation of method list. 2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org> * native/jni/gstreamer-peer/gst_native_pipeline.c: (get_free_space(int)): Use #else not #elif when there is no condition. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/31895: * java/text/DecimalFormat.java: (setCurrency(Currency)): Update prefixes and suffixes when currency changes. * java/text/DecimalFormatSymbols.java: (DecimalFormatSymbols(Locale)): Set locale earlier so it can be used by setCurrency(Currency). (setCurrency(Currency)): Set the symbol correctly using the locale of the instance. * java/util/Currency.java: Throw error instead of just printing a message. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/activation/ActivationDataFlavor.java: Suppress warnings from public API. (mimeType): Made final. (representationClass): Added generic type and made final. (normalizeMimeTypeParameter(String,String)): Use CPStringBuilder. * javax/activation/CommandInfo.java: (verb): Made final. (className): Made final. * javax/activation/DataHandler.java: (dataSource): Made final. * javax/activation/FileDataSource.java: (file): Made final. * javax/activation/MailcapCommandMap.java: Use generics on collections and CPStringBuilder instead of StringBuffer. * javax/activation/MimeType.java: (toString()): Use CPStringBuilder. (getBaseType()): Likewise. * javax/activation/MimeTypeParameterList.java: Use generics on collections and CPStringBuilder instead of StringBuffer. * javax/activation/MimeTypeParseException.java: (MimeTypeParseException(String,String)): Use CPStringBuilder. * javax/activation/MimetypesFileTypeMap.java: Use generics on collections and CPStringBuilder instead of StringBuffer. * javax/activation/URLDataSource.java: (url): Made final. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/javax/activation/viewers/ImageViewer.java, * gnu/javax/activation/viewers/TextEditor.java, * gnu/javax/activation/viewers/TextViewer.java, * javax/activation/ActivationDataFlavor.java, * javax/activation/CommandInfo.java, * javax/activation/CommandMap.java, * javax/activation/CommandObject.java, * javax/activation/DataContentHandler.java, * javax/activation/DataContentHandlerFactory.java, * javax/activation/DataHandler.java, * javax/activation/DataHandlerDataSource.java, * javax/activation/DataSource.java, * javax/activation/DataSourceDataContentHandler.java, * javax/activation/FileDataSource.java, * javax/activation/FileTypeMap.java, * javax/activation/MailcapCommandMap.java, * javax/activation/MimeType.java, * javax/activation/MimeTypeParameterList.java, * javax/activation/MimeTypeParseException.java, * javax/activation/MimetypesFileTypeMap.java, * javax/activation/ObjectDataContentHandler.java, * javax/activation/URLDataSource.java, * javax/activation/UnsupportedDataTypeException.java, * javax/activation/package.html, * resource/META-INF/mailcap.default, * resource/META-INF/mimetypes.default: Import GNU JAF CVS as of 17/08/2008. 2006-04-25 Archit Shah <ashah@redhat.com> * javax/activation/MimeTypeParameterList.java: Insert ';' separator before parameter list. 2005-06-29 Xavier Poinsard <xpoinsard@openpricer.com> * javax/activation/ObjectDataContentHandler.java: Fixed typo. 2005-05-28 Chris Burdess <dog@bluezoo.org> * javax/activation/CommandMap.java, * javax/activation/MailcapCommandMap.java: Updated to JAF 1.1. 2004-06-09 Chris Burdess <dog@bluezoo.org> * javax/activation/MailcapCommandMap.java: Fixed bug whereby x-java prefix was not attempted. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * AUTHORS: Added Laszlo. 2008-04-20 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/30436: * java/util/Scanner.java: Fix package to be java.util and correct indentation. 2007-07-25 Laszlo Andras Hernadi <e0327023@student.tuwien.ac.at> PR classpath/30436: * java/util/Scanner.java: Initial implementation. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/util/regex/Matcher.java: (toMatchResult()): Implemented. 2008-08-13 Joshua Sumali <jsumali@redhat.com> * doc/Makefile.am (gjdoc.pod): Generate gjdoc pod from cp-tools.texinfo instead of invoke.texi. Remove invoke.texi from EXTRA_DIST. * doc/invoke.texi: Removed and merged into ... * doc/cp-tools.texinfo: Here 2008-08-12 Robert Schuster <robertschuster@fsfe.org> * native/jni/java-net/local.c (local_bind): Removed fprintf call, fixed access outside of array bounds. From-SVN: r141271
author: Matthias Klose <doko@gcc.gnu.org> 2008-10-21 17:55:01 +0000
committer: Matthias Klose <doko@gcc.gnu.org> 2008-10-21 17:55:01 +0000
commit: cd6d4007aa4f72b51756e4a571abf876fa3e3133 (patch)
tree: 6de8da5758622565799768e49cd0de6698ca3cb8 /libjava/classpath/tools/resource
parent: d9cc481a359c713f473a136730e4019124368d6b (diff)
download: gcc-cd6d4007aa4f72b51756e4a571abf876fa3e3133.zip
gcc-cd6d4007aa4f72b51756e4a571abf876fa3e3133.tar.gz
gcc-cd6d4007aa4f72b51756e4a571abf876fa3e3133.tar.bz2
64 files changed, 9146 insertions, 2 deletions
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/common/Messages.properties b/libjava/classpath/tools/resource/gnu/classpath/tools/common/Messages.properties
index 989fde7..17e79c4 100644
--- a/libjava/classpath/tools/resource/gnu/classpath/tools/common/Messages.properties
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/common/Messages.properties
@@ -1,5 +1,5 @@
 # MessagesBundle.properties -- English language messages
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Classpath.
 #
@@ -37,4 +37,4 @@
 
 ClasspathToolParser.JArgument=pass argument to the Java runtime
 ClasspathToolParser.JName=OPTION
-ClasspathToolParser.VersionFormat={0} (GNU Classpath) {1}\n\nCopyright 2006 Free Software Foundation, Inc.\nThis is free software; see the source for copying conditions.  There is NO\nwarranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ClasspathToolParser.VersionFormat={0} (GNU Classpath) {1}\n\nCopyright 2008 Free Software Foundation, Inc.\nThis is free software; see the source for copying conditions.  There is NO\nwarranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/gjdoc_common.xsl b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/gjdoc_common.xsl
new file mode 100644
index 0000000..2b5aec1
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/gjdoc_common.xsl
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- gjdoc_common.xsl
+     Copyright (C) 2003 Free Software Foundation, Inc.
+     
+     This file is part of GNU Classpath.
+     
+     GNU Classpath is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+      
+     GNU Classpath is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License
+     along with GNU Classpath; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     02111-1307 USA.
+     -->
+
+<!-- Common templates for HTML generation.
+     -->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml"
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns="http://www.w3.org/TR/REC-html40">
+
+  <xsl:param name="gjdoc.outputfile.info" select="''"/>
+  <xsl:param name="gjdoc.refdocs1" select="''"/>
+  <xsl:param name="gjdoc.pathtoroot" select="''"/>
+  <xsl:param name="gjdoc.xmldoclet.version" select="''"/>
+  <xsl:param name="gjdoc.allowimages" select="0"/>
+  <xsl:param name="gjdoc.option.nonavbar" select="''"/>
+  <xsl:param name="gjdoc.option.noindex" select="''"/>
+  <xsl:param name="gjdoc.option.notree" select="''"/>
+  <xsl:param name="gjdoc.option.nohelp" select="''"/>
+  <xsl:param name="gjdoc.option.nocomment" select="''"/>
+  <xsl:param name="gjdoc.option.splitindex" select="''"/>
+  <xsl:param name="gjdoc.option.linksource" select="''"/>
+  <xsl:param name="gjdoc.option.windowtitle" select="''"/>
+  <xsl:param name="gjdoc.option.helpfile" select="''"/>
+  <xsl:param name="gjdoc.option.stylesheetfile" select="''"/>
+  <xsl:param name="gjdoc.option.header" select="''"/>
+  <xsl:param name="gjdoc.option.footer" select="''"/>
+  <xsl:param name="gjdoc.option.bottom" select="''"/>
+  <xsl:param name="gjdoc.option.doctitle" select="''"/>
+  <xsl:param name="gjdoc.option.nodeprecatedlist" select="''"/>
+  <xsl:param name="gjdoc.option.uses" select="''"/>
+</xsl:stylesheet>
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/about.xsl b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/about.xsl
new file mode 100644
index 0000000..fa78cb3
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/about.xsl
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- about.xsl
+     Copyright (C) 2004 Free Software Foundation, Inc.
+     
+     This file is part of GNU Classpath.
+     
+     GNU Classpath is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+      
+     GNU Classpath is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License
+     along with GNU Classpath; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     02111-1307 USA.
+     -->
+
+<!-- Creates the class descriptor files for HTML documentation. 
+     -->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml"
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns="http://www.w3.org/TR/REC-html40">
+
+  <xsl:include href="html_common.xsl"/>
+
+  <xsl:output method="html"
+    encoding="utf-8"
+    doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
+    doctype-system="http://www.w3.org/TR/html4/loose.dtd"
+    indent="no"/>
+
+  <xsl:strip-space elements="*"/>
+
+  <xsl:template match="/">    
+    <html>
+      <head>
+        <xsl:call-template name="include_common"/>
+        <xsl:call-template name="output_title">
+          <xsl:with-param name="p_pagetitle" select="'Help'"/>
+        </xsl:call-template>
+      </head>
+      <body class="classdoc" onload="if(parent.contentPageLoaded)parent.contentPageLoaded()">
+
+        <div class="pagebody">
+
+        <!-- Top Navigation Bar -->
+        <xsl:call-template name="output_navbar">
+          <xsl:with-param name="p_show_package" select="0"/>
+          <xsl:with-param name="p_show_package_tree" select="0"/>
+          <xsl:with-param name="p_show_about" select="0"/>
+          <xsl:with-param name="p_curr_about" select="1"/>
+          <xsl:with-param name="p_top" select="1"/>
+        </xsl:call-template>
+
+        <h1 class="classdoc-title">About this API documentation</h1>
+
+        <div class="footer">
+          <xsl:text>Generated on</xsl:text><xsl:value-of select="document('index.xml', /)/gjdoc:rootdoc/gjdoc:created"/><xsl:text> by </xsl:text><a href="http://www.gnu.org/software/cp-tools" target="cptoolsinfo"><xsl:text>GNU Classpath Tools</xsl:text></a><xsl:text> (Gjdoc XmlDoclet </xsl:text><xsl:value-of select="$gjdoc.xmldoclet.version"/><xsl:text>).</xsl:text>
+        </div>
+        
+        <!-- Bottom Navigation Bar -->
+        <xsl:call-template name="output_navbar">
+          <xsl:with-param name="p_show_package" select="0"/>
+          <xsl:with-param name="p_show_package_tree" select="0"/>
+          <xsl:with-param name="p_show_about" select="0"/>
+          <xsl:with-param name="p_curr_about" select="1"/>
+          <xsl:with-param name="p_top" select="0"/>
+        </xsl:call-template>
+        </div>
+      </body>
+    </html>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/allclasses.xsl b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/allclasses.xsl
new file mode 100644
index 0000000..8739d19
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/allclasses.xsl
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- allclasses.xsl
+     Copyright (C) 2003 Free Software Foundation, Inc.
+     
+     This file is part of GNU Classpath.
+     
+     GNU Classpath is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+      
+     GNU Classpath is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License
+     along with GNU Classpath; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     02111-1307 USA.
+     -->
+
+<!-- Creates the allclasses.html file for HTML documentation. 
+     -->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml"
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns="http://www.w3.org/TR/REC-html40">
+
+  <xsl:include href="html_common.xsl"/>
+
+  <xsl:output method="xml"
+    encoding="utf-8"
+    indent="no"/>
+
+  <xsl:strip-space elements="*"/>
+
+  <xsl:template match="/">
+      <html>
+        <head>
+          <title>
+            <xsl:value-of select="concat(/gjdoc:rootdoc/gjdoc:title, ' - All Classes')"/>
+          </title>
+          <xsl:call-template name="include_common"/>
+        </head>
+        <body onload="secondaryPageLoaded('classes');" class="menu allclasses">
+          <h3 class="menu-title">All Classes</h3>
+          <xsl:for-each select="gjdoc:rootdoc/gjdoc:classdoc/@name">
+            <xsl:sort select="." order="ascending"/>
+            <xsl:variable name="v_url" select="concat(translate(../gjdoc:containingPackage/@name,'.','/'), '/', ../@name, '.html')"/>
+            <a href="{$v_url}" target="content" class="menu allclasses">
+              <xsl:value-of select="."/>
+            </a>
+            <br/>
+          </xsl:for-each>
+        </body>
+      </html>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/allpackages.xsl b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/allpackages.xsl
new file mode 100644
index 0000000..d4449ef
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/allpackages.xsl
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- allpackages.xsl
+     Copyright (C) 2003 Free Software Foundation, Inc.
+     
+     This file is part of GNU Classpath.
+     
+     GNU Classpath is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+      
+     GNU Classpath is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License
+     along with GNU Classpath; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     02111-1307 USA.
+     -->
+
+<!-- Creates the allpackages.html file for HTML documentation. 
+     -->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml"
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns="http://www.w3.org/TR/REC-html40">
+
+  <xsl:include href="html_common.xsl"/>
+
+  <xsl:output method="xml"
+    encoding="utf-8"
+    indent="no"/>
+
+  <xsl:strip-space elements="*"/>
+
+  <xsl:template match="/">
+    <html>
+      <head>
+        <title>
+          <xsl:if test="document('index.xml',/)/gjdoc:rootdoc/gjdoc:title">
+            <xsl:value-of select="document('index.xml',/)/gjdoc:rootdoc/gjdoc:title"/>
+            <xsl:text> - </xsl:text>
+          </xsl:if>
+          <xsl:text>Packages</xsl:text>
+          <xsl:value-of select="@name"/>
+        </title>
+        <xsl:call-template name="include_common"/>
+      </head>
+      <body class="menu allpackages">
+        <h3 class="menu-title">
+          <a href="index_noframes.html" target="content">
+            <xsl:choose>
+              <xsl:when test="document('index.xml',/)/gjdoc:rootdoc/gjdoc:title">
+                <xsl:value-of select="document('index.xml',/)/gjdoc:rootdoc/gjdoc:title"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:text>Packages</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose>
+          </a>
+        </h3>
+        <a href="allclasses.html" target="classes" class="menu allpackages">All Classes</a><br/><br/>
+        <xsl:for-each select="gjdoc:rootdoc/gjdoc:specifiedpackage/@name">
+          <xsl:sort select="." order="ascending"/>
+          <a href="{concat(translate(., '.','/'), '/classes.html')}" target="classes" class="menu allpackages">
+            <xsl:value-of select="."/>
+          </a>
+          <br/>
+        </xsl:for-each>
+      </body>
+    </html>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/alphaindex.xsl b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/alphaindex.xsl
new file mode 100644
index 0000000..5aa915cd
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/alphaindex.xsl
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- alphaindex.xsl
+     Copyright (C) 2003 Free Software Foundation, Inc.
+     
+     This file is part of GNU Classpath.
+     
+     GNU Classpath is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+      
+     GNU Classpath is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License
+     along with GNU Classpath; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     02111-1307 USA.
+     -->
+
+<!-- Creates the alphaindex.html file for HTML documentation. 
+     -->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml"
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns="http://www.w3.org/TR/REC-html40">
+
+  <xsl:include href="html_common.xsl"/>
+
+  <xsl:output method="xml"
+    encoding="utf-8"
+    indent="no"/>
+
+  <xsl:strip-space elements="*"/>
+
+  <xsl:template match="/">
+
+    <html>
+      <head>
+        <xsl:call-template name="output_title">
+          <xsl:with-param name="p_pagetitle" select="'Alphabetical Index'"/>
+        </xsl:call-template>
+        <xsl:call-template name="include_common"/>
+      </head>
+      <body class="classdoc" onload="if(parent.contentPageLoaded)parent.contentPageLoaded(document.title)">
+
+        <!-- Top Navigation Bar -->
+        <xsl:call-template name="output_navbar">
+          <xsl:with-param name="p_show_frames" select="1"/>
+          <xsl:with-param name="p_show_noframes" select="1"/>
+          <xsl:with-param name="p_show_package" select="0"/>
+          <xsl:with-param name="p_show_package_tree" select="0"/>
+          <xsl:with-param name="p_show_full_tree" select="1"/>
+          <xsl:with-param name="p_show_index" select="0"/>
+          <xsl:with-param name="p_curr_index" select="1"/>
+          <xsl:with-param name="p_show_help" select="1"/>
+          <xsl:with-param name="p_top" select="1"/> 
+        </xsl:call-template>
+
+        <div class="pagebody">
+        <h1 class="classdoc-title">
+          Alphabetical Index
+        </h1>
+
+        <div class="index-categories">
+          <xsl:for-each select="document('alphaindex.xml',/)/gjdoc:alphaindex/gjdoc:category">
+            <xsl:choose>
+              <xsl:when test="@letter=$gjdoc.outputfile.info">
+                <span class="index-category-current"><xsl:value-of select="@letter"/></span>
+              </xsl:when>
+              <xsl:otherwise>
+                <a href="{concat('#category_', @letter)}" class="index-category-link"><xsl:value-of select="@letter"/></a>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:for-each>
+        </div>
+
+        <xsl:for-each select="document('alphaindex.xml',/)/gjdoc:alphaindex/gjdoc:category">
+          <a name="{concat('category_', @letter)}" class="classdoc"><h3 class="ignore"> </h3></a>
+          <h2><xsl:value-of select="@letter"/></h2>
+          <xsl:call-template name="output_alphaindex_category"/>
+        </xsl:for-each>
+        
+        <!-- Bottom Navigation Bar -->
+        <xsl:call-template name="output_navbar">
+          <xsl:with-param name="p_show_frames" select="1"/>
+          <xsl:with-param name="p_show_noframes" select="1"/>
+          <xsl:with-param name="p_show_package" select="0"/>
+          <xsl:with-param name="p_show_package_tree" select="0"/>
+          <xsl:with-param name="p_show_full_tree" select="1"/>
+          <xsl:with-param name="p_show_index" select="0"/>
+          <xsl:with-param name="p_curr_index" select="1"/>
+          <xsl:with-param name="p_show_help" select="1"/>
+          <xsl:with-param name="p_top" select="0"/> 
+        </xsl:call-template>
+        </div>
+      </body>
+    </html>
+    
+  </xsl:template>  
+
+</xsl:stylesheet>
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/alphaindex_chunked.xsl b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/alphaindex_chunked.xsl
new file mode 100644
index 0000000..e184738
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/alphaindex_chunked.xsl
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- alphaindex.xsl
+     Copyright (C) 2003 Free Software Foundation, Inc.
+     
+     This file is part of GNU Classpath.
+     
+     GNU Classpath is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+      
+     GNU Classpath is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License
+     along with GNU Classpath; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     02111-1307 USA.
+     -->
+
+<!-- Creates the alphaindex.html file for HTML documentation. 
+     -->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml"
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns="http://www.w3.org/TR/REC-html40">
+
+  <xsl:include href="html_common.xsl"/>
+
+  <xsl:output method="xml"
+    encoding="utf-8"
+    indent="no"/>
+
+  <xsl:strip-space elements="*"/>
+
+  <xsl:template match="/">
+
+    <html>
+      <head>
+        <xsl:call-template name="output_title">
+          <xsl:with-param name="p_pagetitle" select="concat('Alphabetical Index: ', $gjdoc.outputfile.info)"/>
+        </xsl:call-template>
+        <xsl:call-template name="include_common"/>
+      </head>
+      <body class="classdoc" onload="if(parent.contentPageLoaded)parent.contentPageLoaded(document.title)">
+        <div class="pagebody">
+        <!-- Top Navigation Bar -->
+        <xsl:call-template name="output_navbar">
+          <xsl:with-param name="p_show_frames" select="1"/>
+          <xsl:with-param name="p_show_noframes" select="1"/>
+          <xsl:with-param name="p_show_package" select="0"/>
+          <xsl:with-param name="p_show_package_tree" select="0"/>
+          <xsl:with-param name="p_show_full_tree" select="1"/>
+          <xsl:with-param name="p_show_index" select="0"/>
+          <xsl:with-param name="p_curr_index" select="1"/>
+          <xsl:with-param name="p_show_help" select="1"/>
+          <xsl:with-param name="p_top" select="1"/> 
+        </xsl:call-template>
+
+        <h1 class="classdoc-title">
+          Alphabetical Index
+          <xsl:if test="$gjdoc.outputfile.info">
+            - 
+            <xsl:value-of select="$gjdoc.outputfile.info"/>
+          </xsl:if>
+        </h1>
+
+        <div class="index-categories">
+          <xsl:for-each select="document('alphaindex.xml',/)/gjdoc:alphaindex/gjdoc:category">
+            <xsl:choose>
+              <xsl:when test="@letter=$gjdoc.outputfile.info">
+                <span class="index-category-current"><xsl:value-of select="@letter"/></span>
+              </xsl:when>
+              <xsl:otherwise>
+                <a href="{concat('alphaindex_', @letter, '.html') class="index-category-link"}"><xsl:value-of select="@letter"/></a>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:for-each>
+        </div>
+
+        <xsl:if test="$gjdoc.outputfile.info">
+          <xsl:for-each select="document('alphaindex.xml',/)/gjdoc:alphaindex/gjdoc:category[@letter=$gjdoc.outputfile.info]">
+            <h2><xsl:value-of select="@letter"/></h2>
+            <xsl:call-template name="output_alphaindex_category"/>
+          </xsl:for-each>
+          
+        </xsl:if>
+
+        <!-- Bottom Navigation Bar -->
+        <xsl:call-template name="output_navbar">
+          <xsl:with-param name="p_show_frames" select="1"/>
+          <xsl:with-param name="p_show_noframes" select="1"/>
+          <xsl:with-param name="p_show_package" select="0"/>
+          <xsl:with-param name="p_show_package_tree" select="0"/>
+          <xsl:with-param name="p_show_full_tree" select="1"/>
+          <xsl:with-param name="p_show_index" select="0"/>
+          <xsl:with-param name="p_curr_index" select="1"/>
+          <xsl:with-param name="p_show_help" select="1"/>
+          <xsl:with-param name="p_top" select="0"/> 
+        </xsl:call-template>
+        </div>
+      </body>
+    </html>
+    
+  </xsl:template>  
+
+</xsl:stylesheet>
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/classdoc-source.xsl b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/classdoc-source.xsl
new file mode 100644
index 0000000..a6405e4
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/classdoc-source.xsl
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- classdoc-source.xsl
+     Copyright (C) 2003 Free Software Foundation, Inc.
+     
+     This file is part of GNU Classpath.
+     
+     GNU Classpath is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+      
+     GNU Classpath is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License
+     along with GNU Classpath; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     02111-1307 USA.
+     -->
+
+<!-- Outputs an HTML file showing the source code for the class
+     designated by $gjdoc.outputfile.info.
+     -->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml"
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns="http://www.w3.org/TR/REC-html40">
+
+  <xsl:include href="html_common.xsl"/>
+
+  <xsl:output method="html"
+    encoding="utf-8"
+    doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
+    doctype-system="http://www.w3.org/TR/html4/loose.dtd"
+    indent="no"/>
+
+  <xsl:strip-space elements="*"/>
+
+  <xsl:template match="/">
+    <xsl:for-each select="document(concat($gjdoc.outputfile.info, '.xml'),/gjdoc:rootdoc)/gjdoc:classdoc/gjdoc:source">
+      <html>
+      <head>
+        <xsl:call-template name="include_common"/>
+        <xsl:call-template name="output_title">
+          <xsl:with-param name="p_pagetitle" select="concat(ancestor::gjdoc:classdoc/@name, '.java')"/>
+        </xsl:call-template>
+      </head>
+        <body>
+          <xsl:copy-of select="."/>
+        </body>
+      </html>
+    </xsl:for-each>
+    
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/classdoc-uses.xsl b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/classdoc-uses.xsl
new file mode 100644
index 0000000..17f9b3f
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/classdoc-uses.xsl
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- classdoc-uses.xsl
+     Copyright (C) 2004 Free Software Foundation, Inc.
+     
+     This file is part of GNU Classpath.
+     
+     GNU Classpath is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+      
+     GNU Classpath is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License
+     along with GNU Classpath; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     02111-1307 USA.
+     -->
+
+<!-- Outputs an HTML file showing the source code for the class
+     designated by $gjdoc.outputfile.info.
+     -->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml"
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns="http://www.w3.org/TR/REC-html40">
+
+  <xsl:include href="html_common.xsl"/>
+
+  <xsl:output method="html"
+    encoding="utf-8"
+    doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
+    doctype-system="http://www.w3.org/TR/html4/loose.dtd"
+    indent="no"/>
+
+  <xsl:strip-space elements="*"/>
+
+  <xsl:template match="gjdoc:referencing-package">
+    <h2 class="classdoc-header">
+      Uses in package
+      <xsl:value-of select="@name"/>
+    </h2>
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="gjdoc:user">
+    <dt>
+      <xsl:choose>
+        <xsl:when test="@field">
+          <a href="{concat($gjdoc.pathtoroot, translate(ancestor::gjdoc:referencing-package/@name, '.', '/'), '/', @class, '.html#', @field)}">
+            <xsl:value-of select="concat(@class, '.', @field)"/>
+          </a>
+        </xsl:when>
+        <xsl:when test="@method">
+          <a href="{concat($gjdoc.pathtoroot, translate(ancestor::gjdoc:referencing-package/@name, '.', '/'), '/', @class, '.html#', @method, @signature)}">
+            <xsl:value-of select="concat(@class, '.', @method, @flatSignature)"/>
+          </a>
+        </xsl:when>
+        <xsl:when test="@class">
+          <a href="{concat($gjdoc.pathtoroot, translate(ancestor::gjdoc:referencing-package/@name, '.', '/'), '/', @class, '.html')}">
+            <xsl:value-of select="@class"/>
+          </a>
+        </xsl:when>
+      </xsl:choose>
+    </dt>
+  </xsl:template>
+
+  <xsl:template match="gjdoc:usage-type">
+
+    <h3 class="classdoc-header">
+      <xsl:variable name="v_qualifiedtypename"
+        select="ancestor::gjdoc:classdoc/@qualifiedtypename"/>
+      <xsl:variable name="v_packagename"
+        select="../@name"/>
+      <xsl:choose>
+        <xsl:when test="@id='class-derived-from'">
+          <xsl:text>Classes in </xsl:text><xsl:value-of select="$v_packagename"/><xsl:text> derived from </xsl:text><xsl:value-of select="$v_qualifiedtypename"/>
+        </xsl:when>
+        <xsl:when test="@id='field-of-type'">
+          <xsl:text>Fields in </xsl:text><xsl:value-of select="$v_packagename"/><xsl:text> of type </xsl:text><xsl:value-of select="$v_qualifiedtypename"/>
+        </xsl:when>
+        <xsl:when test="@id='method-with-return-type'">
+          <xsl:text>Methods in </xsl:text><xsl:value-of select="$v_packagename"/><xsl:text> returning </xsl:text><xsl:value-of select="$v_qualifiedtypename"/>
+        </xsl:when>
+        <xsl:when test="@id='method-with-parameter-type'">
+          <xsl:text>Methods in </xsl:text><xsl:value-of select="$v_packagename"/><xsl:text> accepting parameters of type </xsl:text><xsl:value-of select="$v_qualifiedtypename"/>
+        </xsl:when>
+        <xsl:when test="@id='method-with-thrown-type'">
+          <xsl:text>Methods in </xsl:text><xsl:value-of select="$v_packagename"/><xsl:text> throwing </xsl:text><xsl:value-of select="$v_qualifiedtypename"/>
+        </xsl:when>
+        <xsl:when test="@id='constructor-with-parameter-type'">
+          <xsl:text>Constructors in </xsl:text><xsl:value-of select="$v_packagename"/><xsl:text> accepting parameters of type </xsl:text><xsl:value-of select="$v_qualifiedtypename"/>
+        </xsl:when>
+        <xsl:when test="@id='constructor-with-thrown-type'">
+          <xsl:text>Constructors in </xsl:text><xsl:value-of select="$v_packagename"/><xsl:text> throwing </xsl:text><xsl:value-of select="$v_qualifiedtypename"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>Unknown ID </xsl:text><xsl:value-of select="@id"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </h3>
+    <dl>
+      <xsl:apply-templates/>
+    </dl>
+  </xsl:template>
+
+  <xsl:template match="/">
+    <html>
+      <head>
+        <xsl:call-template name="include_common"/>
+        <xsl:call-template name="output_title">
+          <xsl:with-param name="p_pagetitle" select="concat(ancestor::gjdoc:classdoc/@name, ' Class Usage')"/>
+        </xsl:call-template>
+      </head>
+      <body>
+        <div class="pagebody">
+
+        <!-- Top Navigation Bar -->
+        <xsl:call-template name="output_navbar">
+          <xsl:with-param name="p_show_frames" select="1"/>
+          <xsl:with-param name="p_show_noframes" select="1"/>
+          <xsl:with-param name="p_show_package" select="1"/>
+          <xsl:with-param name="p_show_package_tree" select="1"/>
+          <xsl:with-param name="p_show_full_tree" select="1"/>
+          <xsl:with-param name="p_show_index" select="1"/>
+          <xsl:with-param name="p_show_help" select="1"/> 
+          <xsl:with-param name="p_top" select="1"/> 
+          <xsl:with-param name="p_show_source" select="concat($gjdoc.pathtoroot, 'src-html/', translate(gjdoc:containingPackage/@name, '.', '/'), '/', @name, '.html')"/>
+          <xsl:with-param name="p_show_class" select="concat($gjdoc.pathtoroot, translate(gjdoc:containingPackage/@name, '.', '/'), '/', @name, '.html')"/>
+          <xsl:with-param name="p_curr_uses" select="1"/>
+        </xsl:call-template>
+        
+        <xsl:for-each select="document(concat($gjdoc.outputfile.info, '.xml'),/gjdoc:rootdoc)/gjdoc:classdoc/gjdoc:references">
+
+          <h1 class="classdoc-header">
+            Uses of class
+            <xsl:value-of select="ancestor::gjdoc:classdoc/@qualifiedtypename"/>
+            <xsl:apply-templates/>
+          </h1>
+        </xsl:for-each>
+
+        <!-- Bottom Navigation Bar -->
+        <xsl:call-template name="output_navbar">
+          <xsl:with-param name="p_show_frames" select="1"/>
+          <xsl:with-param name="p_show_noframes" select="1"/>
+          <xsl:with-param name="p_show_package" select="1"/>
+          <xsl:with-param name="p_show_package_tree" select="1"/>
+          <xsl:with-param name="p_show_full_tree" select="1"/>
+          <xsl:with-param name="p_show_index" select="1"/>
+          <xsl:with-param name="p_show_help" select="1"/> 
+          <xsl:with-param name="p_top" select="0"/> 
+          <xsl:with-param name="p_show_source" select="concat($gjdoc.pathtoroot, 'src-html/', translate(gjdoc:containingPackage/@name, '.', '/'), '/', @name, '.html')"/>
+          <xsl:with-param name="p_show_class" select="concat($gjdoc.pathtoroot, translate(gjdoc:containingPackage/@name, '.', '/'), '/', @name, '.html')"/>
+          <xsl:with-param name="p_curr_uses" select="1"/>
+        </xsl:call-template>
+
+        </div>
+      </body>
+    </html>
+  
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/classdoc.xsl b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/classdoc.xsl
new file mode 100644
index 0000000..e54e5fb
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/classdoc.xsl
@@ -0,0 +1,1070 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- classdoc.xsl
+     Copyright (C) 2003 Free Software Foundation, Inc.
+     
+     This file is part of GNU Classpath.
+     
+     GNU Classpath is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+      
+     GNU Classpath is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License
+     along with GNU Classpath; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     02111-1307 USA.
+     -->
+
+<!-- Creates the class descriptor files for HTML documentation. 
+     -->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml"
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns="http://www.w3.org/TR/REC-html40">
+
+  <xsl:include href="html_common.xsl"/>
+
+  <xsl:output method="html"
+    encoding="utf-8"
+    doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
+    doctype-system="http://www.w3.org/TR/html4/loose.dtd"
+    indent="no"/>
+
+  <xsl:strip-space elements="*"/>
+
+  <xsl:template match="gjdoc:tag[attribute::kind='@see'][attribute::name='@link']">
+    <xsl:call-template name="output_link_tag"/>
+  </xsl:template>
+
+  <xsl:template mode="pre" match="*">
+    <xsl:choose>
+      <xsl:when test="'pre'=local-name(.)">
+        <xsl:apply-templates mode="pre"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:copy-of select="."/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template mode="pre" match="text()[position()=last()]">
+    <xsl:call-template name="strip_trailing_ws">
+      <xsl:with-param name="p_content" select="."/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template name="strip_trailing_ws">
+    <xsl:param name="p_content"/>
+
+    <xsl:if test="normalize-space($p_content)!=''">
+      <xsl:choose>
+        <xsl:when test="normalize-space(substring($p_content, string-length($p_content), 1))=''">
+          <xsl:call-template name="strip_trailing_ws">
+            <xsl:with-param name="p_content">
+              <xsl:value-of select="substring($p_content, 1, string-length($p_content)-1)"/>
+            </xsl:with-param>
+          </xsl:call-template>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:copy-of select="$p_content"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="*">
+    <xsl:element name="{name()}">
+      <xsl:for-each select="attribute::*">
+        <xsl:attribute name="{name()}">
+          <xsl:value-of select="."/>              
+        </xsl:attribute>
+      </xsl:for-each>
+      <xsl:choose>
+        <xsl:when test="name()='pre'">
+          <xsl:apply-templates select="." mode="pre"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates/>
+        </xsl:otherwise>
+      </xsl:choose>        
+    </xsl:element>
+  </xsl:template>
+
+  <xsl:template match="/">
+
+    <xsl:for-each select="document(concat($gjdoc.outputfile.info, '.xml'),/gjdoc:rootdoc)/gjdoc:classdoc">
+      <xsl:call-template name="create_classdoc"/>
+    </xsl:for-each>
+
+  </xsl:template>
+
+  <!-- For every classdoc node found in the source XML, create a corresponding -->
+  <!-- class rootdoc HTML file. -->
+  
+  <xsl:template name="create_classdoc">
+
+    <xsl:variable name="v_sub_xml_filename">
+      <xsl:value-of select="concat(@qualifiedtypename,'.xml')"/>
+    </xsl:variable>  
+    
+    <html>
+      <head>
+        <xsl:call-template name="output_title">
+          <xsl:with-param name="p_pagetitle" select="@name"/>
+        </xsl:call-template>
+        <xsl:call-template name="include_common"/>
+      </head>
+      <body class="classdoc" onload="if(parent.contentPageLoaded)parent.contentPageLoaded(document.title)">
+
+        <div class="pagebody">
+
+        <xsl:call-template name="classdoc_header"/>
+        <xsl:call-template name="classdoc_all_field_summary">
+          <xsl:with-param name="v_sub_xml_filename">
+            <xsl:value-of select="$v_sub_xml_filename"/>
+          </xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="classdoc_all_constructor_summary">
+          <xsl:with-param name="v_sub_xml_filename">
+            <xsl:value-of select="$v_sub_xml_filename"/>
+          </xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="classdoc_all_method_summary">
+          <xsl:with-param name="v_sub_xml_filename">
+            <xsl:value-of select="$v_sub_xml_filename"/>
+          </xsl:with-param>
+        </xsl:call-template>
+        
+        <xsl:if test="gjdoc:fielddoc">
+          <h1 class="classdoc-header">Field Details</h1>
+          
+          <xsl:for-each select="gjdoc:fielddoc">
+            <xsl:sort select="@name" order="ascending"/>
+            <xsl:call-template name="classdoc_field_details"/>
+          </xsl:for-each>
+        </xsl:if>
+        
+        <xsl:if test="gjdoc:constructordoc">
+          <h1 class="classdoc-header">Constructor Details</h1>
+          
+          <xsl:for-each select="gjdoc:constructordoc">
+            <xsl:sort select="gjdoc:signature/@full" order="ascending"/>
+            <xsl:call-template name="classdoc_method_details"/>
+          </xsl:for-each>
+        </xsl:if>
+        
+        <xsl:if test="gjdoc:methoddoc">
+          <h1 class="classdoc-header">Method Details</h1>
+          
+          <xsl:for-each select="gjdoc:methoddoc">
+            <xsl:sort select="@name" order="ascending"/>
+            <xsl:sort select="gjdoc:signature/@full" order="ascending"/>
+            <xsl:call-template name="classdoc_method_details"/>
+          </xsl:for-each>
+        </xsl:if>
+
+        <!-- Bottom Navigation Bar -->
+        <xsl:call-template name="output_navbar">
+          <xsl:with-param name="p_show_frames" select="1"/>
+          <xsl:with-param name="p_show_noframes" select="1"/>
+          <xsl:with-param name="p_show_package" select="1"/>
+          <xsl:with-param name="p_show_package_tree" select="1"/>
+          <xsl:with-param name="p_show_full_tree" select="1"/>
+          <xsl:with-param name="p_show_index" select="1"/>
+          <xsl:with-param name="p_show_help" select="1"/> 
+          <xsl:with-param name="p_top" select="0"/> 
+          <xsl:with-param name="p_show_source" select="concat($gjdoc.pathtoroot, 'src-html/', translate(gjdoc:containingPackage/@name, '.', '/'), '/', @name, '.html')"/>
+          <xsl:with-param name="p_show_use" select="concat($gjdoc.pathtoroot, 'class-use/', translate(gjdoc:containingPackage/@name, '.', '/'), '/', @name, '.html')"/>
+          <xsl:with-param name="p_curr_class" select="1"/>
+        </xsl:call-template>
+        
+        </div>
+      </body>
+    </html>
+  </xsl:template>
+
+  <!-- Output header for Class documentation  -->
+  
+  <xsl:template name="classdoc_header">
+    
+    <!-- Top Navigation Bar -->
+    <xsl:call-template name="output_navbar">
+      <xsl:with-param name="p_show_frames" select="1"/>
+      <xsl:with-param name="p_show_noframes" select="1"/>
+      <xsl:with-param name="p_show_package" select="1"/>
+      <xsl:with-param name="p_show_package_tree" select="1"/>
+      <xsl:with-param name="p_show_full_tree" select="1"/>
+      <xsl:with-param name="p_show_index" select="1"/>
+      <xsl:with-param name="p_show_help" select="1"/> 
+      <xsl:with-param name="p_top" select="1"/> 
+      <xsl:with-param name="p_show_source" select="concat($gjdoc.pathtoroot, 'src-html/', translate(gjdoc:containingPackage/@name, '.', '/'), '/', @name, '.html')"/>
+      <xsl:with-param name="p_show_use" select="concat($gjdoc.pathtoroot, 'class-use/', translate(gjdoc:containingPackage/@name, '.', '/'), '/', @name, '.html')"/>
+      <xsl:with-param name="p_curr_class" select="1"/>
+    </xsl:call-template>
+
+    <div class="classdoc-head">
+
+        <div class="classdoc-head-packagename classdoc-subtitle">
+          <xsl:value-of select="gjdoc:containingPackage/@name"/>
+        </div>
+    
+        <h1 class="classdoc-head-classname classdoc-title">
+          <xsl:choose>
+            <xsl:when test="gjdoc:isInterface">
+              <xsl:text>Interface </xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:text>Class </xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+          <xsl:value-of select="@name"/>
+        </h1>
+
+    </div>
+
+    <xsl:if test="gjdoc:isClass">
+      <xsl:call-template name="classdoc_heritage_tree"/>
+    </xsl:if>
+
+    <xsl:if test="gjdoc:containingClass">
+      <xsl:variable name="v_qualifiedtypename" select="attribute::qualifiedtypename"/>
+      <b>Enclosing Class:</b><br/>
+      <xsl:call-template name="link_to_class">
+        <xsl:with-param name="p_name" select="gjdoc:containingClass/@typename"/>
+        <xsl:with-param name="p_qualifiedname" select="gjdoc:containingClass/@qualifiedtypename"/>
+      </xsl:call-template>
+    </xsl:if>
+    
+    <xsl:if test="gjdoc:implements">
+      <p/>
+      <b>
+        <xsl:choose>
+          <xsl:when test="gjdoc:isInterface">
+            <xsl:text>All Superinterfaces:</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:text>All Implemented Interfaces:</xsl:text>
+          </xsl:otherwise>
+        </xsl:choose>
+      </b>
+      <br/>
+      <xsl:for-each select="gjdoc:implements|gjdoc:superimplements">
+        <xsl:sort select="@qualifiedtypename" order="ascending"/>
+        <xsl:call-template name="link_to_class">
+          <xsl:with-param name="p_name" select="@typename"/>
+          <xsl:with-param name="p_qualifiedname" select="@qualifiedtypename"/>
+        </xsl:call-template>
+        <xsl:if test="position() != last()">
+          <xsl:text>, </xsl:text>
+        </xsl:if>
+      </xsl:for-each>
+    </xsl:if>
+    <p/>
+
+    <xsl:if test="gjdoc:isInterface">
+      <xsl:variable name="v_qualifiedtypename" select="attribute::qualifiedtypename"/>
+      <xsl:variable name="v_implementors" select="document('index.xml', /)/gjdoc:rootdoc/gjdoc:classdoc[child::gjdoc:isInterface]/gjdoc:implements[attribute::qualifiedtypename=$v_qualifiedtypename]"/>
+      <xsl:if test="$v_implementors">
+        <b>All Known Direct Subinterfaces:</b><br/>
+        <xsl:for-each select="$v_implementors">
+          <xsl:sort select="../@qualifiedtypename" order="ascending"/>
+          <xsl:call-template name="link_to_class">
+            <xsl:with-param name="p_name" select="../@name"/>
+            <xsl:with-param name="p_qualifiedname" select="../@qualifiedtypename"/>
+          </xsl:call-template>
+          <xsl:if test="position() != last()">
+            <xsl:text>, </xsl:text>
+          </xsl:if>
+        </xsl:for-each>
+      </xsl:if>
+    </xsl:if>
+
+    <xsl:if test="gjdoc:isInterface">
+      <xsl:variable name="v_qualifiedtypename" select="attribute::qualifiedtypename"/>
+      <xsl:variable name="v_implementors" select="document('index.xml', /)/gjdoc:rootdoc/gjdoc:classdoc[child::gjdoc:isClass]/gjdoc:implements[attribute::qualifiedtypename=$v_qualifiedtypename]"/>
+      <xsl:if test="$v_implementors">
+        <b>Known Implementing Classes:</b><br/>
+        <xsl:for-each select="$v_implementors">
+          <xsl:sort select="../@qualifiedtypename" order="ascending"/>
+          <xsl:call-template name="link_to_class">
+            <xsl:with-param name="p_name" select="../@name"/>
+            <xsl:with-param name="p_qualifiedname" select="../@qualifiedtypename"/>
+          </xsl:call-template>
+          <xsl:if test="position() != last()">
+            <xsl:text>, </xsl:text>
+          </xsl:if>
+        </xsl:for-each>
+      </xsl:if>
+    </xsl:if>
+
+    <xsl:if test="gjdoc:isClass">
+      <xsl:variable name="v_qualifiedtypename" select="attribute::qualifiedtypename"/>
+      <xsl:variable name="v_implementors" select="document('index.xml', /)/gjdoc:rootdoc/gjdoc:classdoc[not(child::gjdoc:isInterface)]/gjdoc:superclass[attribute::qualifiedtypename=$v_qualifiedtypename]"/>
+      <xsl:if test="$v_implementors">
+        <b>Known Direct Subclasses:</b><br/>
+        <xsl:for-each select="$v_implementors">
+          <xsl:sort select="../@qualifiedtypename" order="ascending"/>
+          <xsl:call-template name="link_to_class">
+            <xsl:with-param name="p_name" select="../@name"/>
+            <xsl:with-param name="p_qualifiedname" select="../@qualifiedtypename"/>
+          </xsl:call-template>
+          <xsl:if test="position() != last()">
+            <xsl:text>, </xsl:text>
+          </xsl:if>
+        </xsl:for-each>
+      </xsl:if>
+    </xsl:if>
+
+    <hr/>
+    
+    <div class="classdoc-prototype">
+
+      <!-- 'public final class Byte' -->
+      
+      <xsl:value-of select="gjdoc:access/@scope"/><xsl:text> </xsl:text>
+      <xsl:if test="gjdoc:isStatic"><xsl:text>static </xsl:text></xsl:if>
+      <xsl:if test="gjdoc:isFinal"><xsl:text>final </xsl:text></xsl:if>
+      <xsl:choose>
+        <xsl:when test="gjdoc:isInterface">
+          <xsl:text>interface </xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:if test="gjdoc:isAbstract"><xsl:text>abstract </xsl:text></xsl:if>
+          <xsl:text>class </xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+
+      <xsl:call-template name="link_to_class_source"/><br/>
+    
+      <!-- 'extends Number' -->
+      
+      <xsl:if test="gjdoc:isClass and @qualifiedtypename!='java.lang.Object'">
+        <xsl:text>extends </xsl:text>
+        <xsl:call-template name="link_to_class">
+          <xsl:with-param name="p_qualifiedname">
+            <xsl:value-of select="gjdoc:superclass/@qualifiedtypename"/>
+          </xsl:with-param>
+          <xsl:with-param name="p_name">
+            <xsl:value-of select="gjdoc:superclass/@typename"/>
+          </xsl:with-param>
+        </xsl:call-template>
+        <br/>
+      </xsl:if>
+      
+      <!-- 'implements Comparable' -->
+      
+      <xsl:if test="gjdoc:implements">
+        <xsl:text>implements </xsl:text>
+      </xsl:if>
+      <xsl:for-each select="gjdoc:implements">
+        <xsl:call-template name="link_to_class">
+          <xsl:with-param name="p_qualifiedname">
+            <xsl:value-of select="@qualifiedtypename"/>
+          </xsl:with-param>
+          <xsl:with-param name="p_name">
+            <xsl:value-of select="@typename"/>
+          </xsl:with-param>
+        </xsl:call-template>
+        <xsl:if test="position() != last()">
+          <xsl:text>, </xsl:text>
+        </xsl:if>
+      </xsl:for-each>
+      
+    </div>
+    
+    <!-- Documentation -->
+    
+    <p/>
+    
+    <xsl:if test="gjdoc:inlineTags">
+      <div class="classdoc-class-comment-body">
+        <xsl:for-each select="gjdoc:inlineTags/node()">
+          <xsl:apply-templates select="."/>
+        </xsl:for-each>
+      </div>
+    </xsl:if>
+
+    <xsl:call-template name="output_see_tags"/>
+    <xsl:call-template name="output_taglet_tags"/>
+
+  </xsl:template>
+
+  <xsl:template name="output_taglet_tags">
+
+    <xsl:for-each select="gjdoc:tags/gjdoc:tag">
+      <xsl:choose>
+        <xsl:when test="@name='@deprecated'">
+          <div class="classdoc-tag-section-header">
+            <xsl:value-of select="'Deprecated:'"/>
+          </div>
+          <dl class="classdoc-list">
+            <xsl:for-each select="gjdoc:inlineTags">
+              <xsl:apply-templates/>
+            </xsl:for-each>
+          </dl>
+        </xsl:when>
+        <xsl:when test="@taglet-generated">
+          <xsl:copy-of select="./*"/>
+        </xsl:when>
+      </xsl:choose>
+    </xsl:for-each>
+    
+  </xsl:template>
+
+  <!-- Output summary of all fields in this class -->
+
+  <xsl:template name="classdoc_all_field_summary">
+
+    <xsl:if test=".//gjdoc:fielddoc">    
+    
+      <table border="1" cellspacing="0" class="classdoc-table">
+        <tr><td class="section-header" colspan="2"><div class="section-header">Field Summary</div></td></tr>
+        <xsl:for-each select="gjdoc:fielddoc">
+          <xsl:sort select="@name" order="ascending"/>
+          <xsl:call-template name="classdoc_field_summary_tr"/>  
+        </xsl:for-each>
+      </table>
+
+      <xsl:for-each select="gjdoc:superclass">
+        <xsl:call-template name="output_superclass_fields"/>
+      </xsl:for-each>
+    </xsl:if>
+
+  </xsl:template>
+ 
+  <!-- Output summary of all methods in this class -->
+  
+  <xsl:template name="classdoc_all_method_summary">
+    
+    <xsl:if test=".//gjdoc:methoddoc">
+      <table border="1" cellspacing="0" class="classdoc-table">
+        <tr><td class="section-header" colspan="2"><div class="section-header">Method Summary</div></td></tr>
+        <xsl:for-each select="gjdoc:methoddoc">
+          <xsl:sort select="@name" order="ascending"/>
+          <xsl:call-template name="classdoc_method_summary_tr"/>  
+        </xsl:for-each>
+      </table>
+
+      <xsl:for-each select="gjdoc:superclass">
+        <xsl:call-template name="output_superclass_methods"/>
+      </xsl:for-each>
+    </xsl:if>
+    
+  </xsl:template>
+  
+  <!-- Output summary of all constructors in this class -->
+  
+  <xsl:template name="classdoc_all_constructor_summary">
+    
+    <xsl:if test=".//gjdoc:constructordoc">
+      <!--
+      <h1 class="classdoc-header">Constructor Summary</h1>
+-->
+    
+      <table class="classdoc-table">
+        <tr><td class="section-header" colspan="2"><div class="section-header">Constructor Summary</div></td></tr>
+        <xsl:for-each select="gjdoc:constructordoc">
+          <xsl:sort select="@name" order="ascending"/>
+          <xsl:call-template name="classdoc_method_summary_tr"/>  
+        </xsl:for-each>
+      </table>
+    </xsl:if>
+
+  </xsl:template>
+  
+  <!-- Output summary of a single field -->
+  
+  <xsl:template name="classdoc_field_summary_tr">
+    
+    <tr valign="top">
+
+      <!-- Left table cell: Modifiers and Return Type  -->
+      
+      <td valign="top" class="member-summary field modifiers">
+        <code class="member-summary field modifiers">
+          <xsl:call-template name="output_modifiers_summary"/>
+          <xsl:call-template name="link_to_class">
+            <xsl:with-param name="p_name">
+              <xsl:value-of select="gjdoc:type/@typename"/>
+            </xsl:with-param>
+            <xsl:with-param name="p_qualifiedname">
+              <xsl:value-of select="gjdoc:type/@qualifiedtypename"/>
+            </xsl:with-param>
+          </xsl:call-template>
+          <xsl:value-of select="gjdoc:type/@dimension"/>
+        </code>
+      </td>
+
+      <!-- Right table cell: name and short description  -->
+      
+      <td class="member-summary field name">
+        <!-- Method signature -->
+        
+        <!-- Link to field definition -->
+          
+        <code class="member-summary field name">
+          <a href="{concat('#',@name)}" class="field name"><xsl:value-of select="@name"/></a>
+        </code>
+
+        <!-- Brief description of field -->
+        
+        <blockquote class="member-summary field comment">
+          <xsl:for-each select="gjdoc:firstSentenceTags/node()">
+            <xsl:value-of select="." disable-output-escaping="yes"/>
+          </xsl:for-each>
+        </blockquote>
+      </td>
+
+    </tr>
+
+  </xsl:template>
+  
+  <xsl:template name="output_modifiers">
+    <xsl:if test="gjdoc:isNative">
+      <xsl:text>native </xsl:text>
+    </xsl:if>
+    <xsl:if test="gjdoc:isStatic">
+      <xsl:text>static </xsl:text>
+    </xsl:if>
+    <xsl:if test="gjdoc:isFinal">
+      <xsl:text>final </xsl:text>
+    </xsl:if>
+    <xsl:if test="gjdoc:isAbstract">
+      <xsl:text>abstract </xsl:text>
+    </xsl:if>
+    <xsl:if test="gjdoc:isTransient">
+      <xsl:text>transient </xsl:text>
+    </xsl:if>
+    <xsl:if test="gjdoc:isVolatile">
+      <xsl:text>volatile </xsl:text>
+    </xsl:if>
+    <xsl:if test="gjdoc:isSynchronized">
+      <xsl:text>synchronized </xsl:text>
+    </xsl:if>
+  </xsl:template>
+  
+  <xsl:template name="output_modifiers_summary">
+    <xsl:if test="gjdoc:isStatic">
+      <xsl:text>static </xsl:text>
+    </xsl:if>
+    <xsl:if test="gjdoc:isAbstract">
+      <xsl:text>abstract </xsl:text>
+    </xsl:if>
+    <xsl:if test="gjdoc:isTransient">
+      <xsl:text>transient </xsl:text>
+    </xsl:if>
+    <xsl:if test="gjdoc:isVolatile">
+      <xsl:text>volatile </xsl:text>
+    </xsl:if>
+    <xsl:if test="gjdoc:isSynchronized">
+      <xsl:text>synchronized </xsl:text>
+    </xsl:if>
+  </xsl:template>
+  
+  <!-- Output summary of a single method or constructor -->
+  
+  <xsl:template name="classdoc_method_summary_tr">
+    
+    <tr valign="top">
+      
+      <!-- Left table cell: Modifiers and Return Type  -->
+      
+      <xsl:if test="gjdoc:isMethod">
+        <td valign="top" class="member-summary method modifiers">
+          <code class="member-summary method modifiers">
+            <xsl:call-template name="output_modifiers_summary"/>
+            <xsl:text> </xsl:text>
+            <xsl:call-template name="link_to_class">
+              <xsl:with-param name="p_qualifiedname" select="gjdoc:returns/@qualifiedtypename"/>
+              <xsl:with-param name="p_name" select="gjdoc:returns/@typename"/>
+            </xsl:call-template>
+            <xsl:value-of select="gjdoc:returns/@dimension"/>
+          </code>
+        </td>
+      </xsl:if>
+      
+      <!-- Right table cell: signature and short description  -->
+      
+      <td align="left" valign="top" class="member-summary method name">
+        
+        <!-- Method signature -->
+        
+        <code class="member-summary method signature">
+          
+          <!-- Link to method definition -->
+          
+          <a href="{concat('#',@name,gjdoc:signature/@full)}" class="member-summary method name"><xsl:value-of select="@name"/></a>
+          
+          <!-- Parameter List -->
+          
+          <xsl:text>(</xsl:text>
+          <xsl:call-template name="list_parameters"/>
+          <xsl:text>)</xsl:text>
+        </code>
+        
+        <!-- Brief description of Method -->
+        
+        <blockquote class="member-summary method comment">
+          <xsl:choose>
+            <xsl:when test="gjdoc:tags/gjdoc:tag[@kind='@deprecated']">
+              <i>
+                <b>Deprecated. </b>
+                <xsl:for-each select="gjdoc:tags/gjdoc:tag[@kind='@deprecated']/gjdoc:firstSentenceTags">
+                  <xsl:apply-templates/>
+                </xsl:for-each>
+              </i>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:for-each select="gjdoc:firstSentenceTags/node()">
+                <xsl:value-of disable-output-escaping="yes" select="."/>
+              </xsl:for-each>
+            </xsl:otherwise>
+          </xsl:choose>
+        </blockquote>
+      </td>
+    </tr>
+    
+  </xsl:template>
+  
+  <!-- Output a list of all parameters of the current methoddoc  -->
+  <xsl:template name="list_parameters">
+    <xsl:for-each select="gjdoc:parameter">
+      <span class="parameter">
+        <xsl:call-template name="link_to_class">
+          <xsl:with-param name="p_qualifiedname">
+            <xsl:value-of select="@qualifiedtypename"/>
+          </xsl:with-param>
+          <xsl:with-param name="p_name">
+            <xsl:value-of select="@typename"/>
+          </xsl:with-param>
+        </xsl:call-template>
+        <xsl:value-of select="@dimension"/>
+        <xsl:text disable-output-escaping="no">&#160;</xsl:text>
+        <xsl:value-of select="@name"/>
+        <xsl:if test="position() != last()">
+          <xsl:text>,</xsl:text>
+        </xsl:if>
+      </span>
+      <xsl:if test="position() != last()">
+        <xsl:text> </xsl:text>
+      </xsl:if>
+    </xsl:for-each>
+  </xsl:template>
+  
+  <xsl:template name="list_parameter_details">
+    <dl class="classdoc-list">
+      <xsl:for-each select="gjdoc:parameter">
+        <dt>
+          <span class="prototype-name">
+            <xsl:value-of select="@name"/>
+          </span>
+          <xsl:variable name="param_position" select="position()"/>
+
+          <xsl:if test="../gjdoc:tags/gjdoc:tag[attribute::kind='@param' and position()=$param_position]">
+            <xsl:text> - </xsl:text>
+            <xsl:for-each select="../gjdoc:tags/gjdoc:tag[attribute::kind='@param' and position()=$param_position]/gjdoc:inlineTags/node()">
+              <xsl:copy-of select="."/>
+            </xsl:for-each>
+          </xsl:if>
+        </dt>
+      </xsl:for-each>
+    </dl>
+  </xsl:template>
+
+  <xsl:template name="output_see_tags">
+    <xsl:if test="gjdoc:tags/gjdoc:tag[attribute::kind='@see']">
+      <div class="classdoc-tag-section-header"><b>See Also:</b></div>
+
+      <dl class="classdoc-list">
+        <xsl:for-each select="gjdoc:tags/gjdoc:tag[attribute::kind='@see']">
+          <!--
+          <xsl:variable name="v_see" select="normalize-space(.)"/>
+          -->
+          <dt>
+            <code>
+              <xsl:call-template name="output_link_tag"/>
+            </code>
+          </dt>
+        </xsl:for-each>
+      </dl>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- Output details of all fields in this class -->
+  
+  <xsl:template name="classdoc_field_details">
+
+    <a name="{@name}" class="classdoc"> </a>
+    <div class="before-details"> </div>
+
+    <h3><xsl:value-of select="@name"/></h3>
+    
+    <p class="prototype"><code>
+      <xsl:value-of select="gjdoc:access/@scope"/>
+      <xsl:text> </xsl:text>
+      <xsl:call-template name="output_modifiers"/>
+      <xsl:value-of select="gjdoc:type/@typename"/>
+      <xsl:value-of select="gjdoc:type/@dimension"/>
+      <xsl:text> </xsl:text>
+      <xsl:call-template name="link_to_member_source"/>
+    </code></p>
+
+    <p/>
+    
+    <!-- Full comment text -->
+    
+    <xsl:if test="gjdoc:inlineTags">
+      <div class="classdoc-comment-body">
+        <xsl:for-each select="gjdoc:inlineTags/node()">
+          <xsl:apply-templates select="."/>
+        </xsl:for-each>
+      </div>
+    </xsl:if>
+      
+    <p/>
+
+    <xsl:call-template name="output_taglet_tags"/>
+
+    <!-- See Also -->
+
+    <xsl:call-template name="output_see_tags"/>
+
+    <xsl:if test="position()!=last()">
+      <hr/>
+    </xsl:if>
+
+  </xsl:template>
+
+  
+  <!-- Output details of all methods in this class -->
+  
+  <xsl:template name="classdoc_method_details">
+
+    <a name="{concat(@name,gjdoc:signature/@full)}" class="classdoc"> </a>
+    <div class="before-details"> </div>
+    
+    <h3><xsl:value-of select="@name"/></h3>
+    
+    <p class="prototype"><code>
+      <xsl:value-of select="gjdoc:access/@scope"/>
+      <xsl:text> </xsl:text>
+      <xsl:call-template name="output_modifiers"/>
+      <xsl:value-of select="gjdoc:returns/@typename"/><xsl:value-of select="gjdoc:returns/@dimension"/>
+      <xsl:text> </xsl:text>
+      <xsl:call-template name="link_to_member_source"/>
+      <xsl:text>(</xsl:text>
+      <xsl:call-template name="list_parameters"/>
+      <xsl:text>)</xsl:text>
+    </code></p>    
+    
+    <!-- Full comment text -->
+    
+    <xsl:if test="gjdoc:inlineTags">
+      <div class="classdoc-comment-body">
+        <xsl:for-each select="gjdoc:inlineTags/node()">
+          <xsl:apply-templates select="."/>
+        </xsl:for-each>
+      </div>
+    </xsl:if>
+
+    <p/>
+
+    <xsl:call-template name="output_taglet_tags"/>
+    
+    <xsl:if test="gjdoc:parameter">
+      <div class="classdoc-tag-section-header"><b>Parameters:</b></div>
+      <xsl:call-template name="list_parameter_details"/>
+    </xsl:if>
+    
+    <xsl:if test="gjdoc:tags/gjdoc:tag[attribute::kind='@return']">
+      <div class="classdoc-tag-section-header"><b>Returns:</b></div>
+      <dl class="classdoc-list">
+        <dt>
+          <xsl:for-each select="gjdoc:tags/gjdoc:tag[attribute::kind='@return']">
+            <xsl:value-of select="." disable-output-escaping="yes"/>
+          </xsl:for-each>
+        </dt>
+      </dl>
+    </xsl:if>
+    
+    <xsl:if test="gjdoc:tags/gjdoc:tag[attribute::kind='@throws']">
+      <div class="classdoc-tag-section-header"><b>Throws:</b></div>
+      <dl class="classdoc-list">
+        <xsl:for-each select="gjdoc:tags/gjdoc:tag[attribute::kind='@throws']">
+          <dt>
+            <code>
+              <xsl:call-template name="link_to_class">
+                <xsl:with-param name="p_qualifiedname">
+                  <xsl:value-of select="gjdoc:exception/@qualifiedtypename"/>
+                </xsl:with-param>
+                <xsl:with-param name="p_name">
+                  <xsl:value-of select="gjdoc:exception/@typename"/>
+                </xsl:with-param>
+              </xsl:call-template>
+            </code>
+            <xsl:text> - </xsl:text>
+            <xsl:for-each select="gjdoc:inlineTags/node()">
+              <xsl:copy-of select="."/>
+            </xsl:for-each>
+          </dt>
+        </xsl:for-each>
+      </dl>
+    </xsl:if>
+    
+    <xsl:call-template name="output_see_tags"/>
+
+    <xsl:if test="position()!=last()">
+      <hr/>
+    </xsl:if>
+    
+  </xsl:template>
+
+  <!-- Recursively create the tree showing the heritage of the -->
+  <!-- given class -->
+  
+  <xsl:template name="create_tree">
+    <xsl:param name="p_superclass"/>
+    <xsl:param name="p_indent"/>	
+    <xsl:param name="p_final" select="0"/>
+
+    <xsl:for-each select="/gjdoc:rootdoc/gjdoc:classdoc[attribute::qualifiedtypename=$p_superclass]">
+      
+      <xsl:if test="gjdoc:superclass">
+        <xsl:call-template name="create_tree">
+          <xsl:with-param name="p_indent" select="$p_indent+-1"/>
+          <xsl:with-param name="p_superclass" select="gjdoc:superclass/@qualifiedtypename"/>
+        </xsl:call-template>
+
+        <xsl:call-template name="tree_indentation_text_empty">
+          <xsl:with-param name="p_indent" select="$p_indent"/>
+        </xsl:call-template>
+        <xsl:text>|
+</xsl:text>
+      </xsl:if>
+    </xsl:for-each>	
+    
+    <xsl:if test="$p_indent>0">	
+      <xsl:call-template name="tree_indentation">
+        <xsl:with-param name="p_indent" select="$p_indent"/>
+      </xsl:call-template>
+    </xsl:if>	
+        
+    <xsl:choose>
+      <xsl:when test="$p_final=1">
+        <xsl:value-of select="$p_superclass"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="link_to_class_full">
+          <xsl:with-param name="p_qualifiedname">
+            <xsl:value-of select="$p_superclass"/>
+          </xsl:with-param>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:text>
+</xsl:text>
+  </xsl:template>
+
+  <!-- Recursively create the tree showing the heritage of the -->
+  <!-- given class, use bitmaps -->
+  
+  <xsl:template name="create_tree_gfx">
+    <xsl:param name="p_superclass"/>
+    <xsl:param name="p_indent"/>	
+    <xsl:param name="p_final" select="0"/>
+    <xsl:if test="/gjdoc:rootdoc/gjdoc:classdoc[attribute::qualifiedtypename=$p_superclass]/gjdoc:superclass">
+      <xsl:call-template name="create_tree">
+        <xsl:with-param name="p_indent" select="$p_indent+-1"/>
+        <xsl:with-param name="p_superclass" select="/gjdoc:rootdoc/gjdoc:classdoc[attribute::qualifiedtypename=$p_superclass]/gjdoc:superclass/@qualifiedtypename"/>
+      </xsl:call-template>
+    </xsl:if>
+    <tr><td>
+    <table cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <xsl:variable name="imagename">
+          <xsl:choose>
+            <xsl:when test="$p_final=1">
+              <xsl:text>images/tree-final-node.png</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:text>images/tree-node.png</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:variable>
+
+        <td>
+          <xsl:if test="$p_indent>0">	
+            <xsl:call-template name="tree_indentation">
+              <xsl:with-param name="p_indent"><xsl:value-of select="$p_indent"/></xsl:with-param>
+            </xsl:call-template>
+          </xsl:if>	
+          <img width="10" height="21" class="classdoc-tree-image" src="{$imagename}"/>
+        </td>
+
+        <xsl:choose>
+          <xsl:when test="$p_final=1">
+            <td class="classdoc-tree-label"><xsl:value-of select="$p_superclass"/></td>
+          </xsl:when>
+          <xsl:otherwise>
+            <td class="classdoc-tree-label">
+              <xsl:call-template name="link_to_class_full">
+                <xsl:with-param name="p_qualifiedname">
+                  <xsl:value-of select="$p_superclass"/>
+                </xsl:with-param>
+              </xsl:call-template>
+            </td>
+          </xsl:otherwise>
+        </xsl:choose>
+      </tr></table>
+    </td></tr>
+  </xsl:template>
+
+  <!-- Recursively output one character for each superclass found for the given -->
+  <!-- class. The length of the resulting string tells how many levels of -->
+  <!-- indentation are required for creating the heritage tree.  -->
+  
+  <xsl:template name="output_base_markers">
+    <xsl:param name="p_superclass"/>
+
+    <xsl:for-each select="/gjdoc:rootdoc/gjdoc:classdoc[attribute::qualifiedtypename=$p_superclass]">      
+      <xsl:if test="gjdoc:superclass">
+        <xsl:call-template name="output_base_markers">
+          <xsl:with-param name="p_superclass" select="gjdoc:superclass/@qualifiedtypename"/>
+        </xsl:call-template>
+      </xsl:if>
+    </xsl:for-each>
+
+    <xsl:text>*</xsl:text>
+  </xsl:template>
+
+  <!-- Heritage Tree -->
+  
+  <xsl:template name="classdoc_heritage_tree">
+    
+    <xsl:variable name="p_qualifiedtypename" select="@qualifiedtypename"/>
+
+    <xsl:for-each select="document('index.xml', /)/gjdoc:rootdoc/gjdoc:classdoc[@qualifiedtypename=$p_qualifiedtypename]">
+
+      <xsl:variable name="superclass_markers">
+        <xsl:call-template name="output_base_markers">
+          <xsl:with-param name="p_superclass" select="gjdoc:superclass/@qualifiedtypename"/>
+        </xsl:call-template>
+      </xsl:variable>
+
+      <xsl:choose>
+        <xsl:when test="$gjdoc.allowimages=1">
+          <table border="0" cellpadding="0" cellspacing="0" style="margin:0px; padding:0px; line-height:1px">
+            <xsl:call-template name="create_tree_gfx">
+              <xsl:with-param name="p_indent" select="string-length($superclass_markers)"/>
+              <xsl:with-param name="p_superclass" select="$p_qualifiedtypename"/>
+              <xsl:with-param name="p_final" select="1"/>
+            </xsl:call-template>
+          </table>
+        </xsl:when>
+        <xsl:otherwise>
+          <pre class="inheritance-tree">
+            <xsl:call-template name="create_tree">
+              <xsl:with-param name="p_indent" select="string-length($superclass_markers)"/>
+              <xsl:with-param name="p_superclass" select="$p_qualifiedtypename"/>
+              <xsl:with-param name="p_final" select="1"/>
+            </xsl:call-template>
+          </pre>
+        </xsl:otherwise>
+      </xsl:choose>      
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="tree_indentation_text_empty">
+    <xsl:param name="p_indent"/>
+    <xsl:choose>
+      <xsl:when test="$p_indent&gt;1">
+        <xsl:text>   </xsl:text>
+        <xsl:call-template name="tree_indentation_text_empty">
+          <xsl:with-param name="p_indent"><xsl:value-of select="$p_indent+-1"/></xsl:with-param>
+        </xsl:call-template>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:template>
+
+  <!-- Recursively insert indentation for heritage tree. -->
+  <!-- This one uses images for nice, visual indentation. -->
+  <!-- p_indent selects level of indentation. -->
+  
+  <xsl:template name="tree_indentation">
+    <xsl:param name="p_indent"/>
+    <xsl:choose>
+      <xsl:when test="$p_indent&gt;1">
+        <xsl:choose>
+          <xsl:when test="$gjdoc.allowimages=1">
+            <img width="26" height="21" border="0" src="images/tree-empty.png" class="classdoc-tree-image"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:text>   </xsl:text>
+          </xsl:otherwise>
+        </xsl:choose>
+
+        <xsl:call-template name="tree_indentation">
+          <xsl:with-param name="p_indent"><xsl:value-of select="$p_indent+-1"/></xsl:with-param>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:choose>
+          <xsl:when test="$gjdoc.allowimages=1">
+            <img width="26" height="21" border="0" src="images/tree-branch.png" class="classdoc-tree-image"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:text>+--</xsl:text>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="output_superclass_methods">
+    <xsl:if test="gjdoc:methoddoc">
+      <table class="classdoc-table">
+        <tr>
+          <td class="sub-section-header">
+            <div class="sub-section-header">Methods inherited from class <xsl:value-of select="@qualifiedtypename"/></div>
+          </td>
+        </tr>
+        <tr>
+          <td class="member-summary super method">
+            <xsl:for-each select="gjdoc:methoddoc">
+              <code class="member-summary super method"><a href="{concat($gjdoc.pathtoroot, translate(../gjdoc:containingPackage/@name, '.', '/'), '/', ../@typename, '.html#', @name, gjdoc:signature/@full)}" class="member-summary super method"><xsl:value-of select="@name"/></a><xsl:if test="position() != last()">, </xsl:if></code>
+            </xsl:for-each>
+          </td>
+        </tr>
+      </table>
+    </xsl:if>
+  </xsl:template>
+
+
+  <xsl:template name="output_superclass_fields">
+    <xsl:if test="gjdoc:fielddoc">
+      <table class="classdoc-table">
+        <tr>
+          <td class="sub-section-header">
+            <div class="sub-section-header">Fields inherited from class <xsl:value-of select="@qualifiedtypename"/></div>
+          </td>
+        </tr>
+        <tr>
+          <td class="member-summary super field">
+            <xsl:for-each select="gjdoc:fielddoc">
+              <code class="member-summary super field"><a href="{concat($gjdoc.pathtoroot, translate(../gjdoc:containingPackage/@name, '.', '/'), '/', ../@typename, '.html#', @name)}" class="member-summary super field"><xsl:value-of select="@name"/></a><xsl:if test="position() != last()">, </xsl:if></code>
+            </xsl:for-each>
+          </td>
+        </tr>
+      </table>
+    </xsl:if>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/deprecated.xsl b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/deprecated.xsl
new file mode 100644
index 0000000..4fc9dfd
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/deprecated.xsl
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- deprecated.xsl
+     Copyright (C) 2003 Free Software Foundation, Inc.
+     
+     This file is part of GNU Classpath.
+     
+     GNU Classpath is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+      
+     GNU Classpath is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License
+     along with GNU Classpath; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     02111-1307 USA.
+     -->
+
+<!-- Creates the deprecation information page for HTML documentation.
+     -->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml"
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns="http://www.w3.org/TR/REC-html40">
+
+  <xsl:include href="html_common.xsl"/>
+
+  <xsl:output method="xml"
+    encoding="utf-8"
+    doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
+    doctype-system="http://www.w3.org/TR/html4/loose.dtd"
+    indent="no"/>
+
+  <xsl:strip-space elements="*"/>
+
+  <xsl:template match="gjdoc:tag[attribute::kind='@see'][attribute::name='@link']">
+    <xsl:call-template name="output_link_tag">
+      <xsl:with-param name="p_contexturl"
+        select="concat(translate(ancestor::gjdoc:classdoc/gjdoc:containingPackage/@name, '.', '/'), '/', ancestor::gjdoc:classdoc/@name,'.html')"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template match="/">
+    <html>
+      <head>
+        <xsl:call-template name="output_title">
+          <xsl:with-param name="p_pagetitle" select="'Deprecated List'"/>
+        </xsl:call-template>
+        <xsl:call-template name="include_common"/>
+      </head>
+      <body class="classdoc" onload="if(parent.contentPageLoaded)parent.contentPageLoaded(document.title)">
+        
+        <!-- Top Navigation Bar -->
+        <xsl:call-template name="output_navbar">
+          <xsl:with-param name="p_show_frames" select="1"/>
+          <xsl:with-param name="p_show_noframes" select="1"/>
+          <xsl:with-param name="p_show_package" select="0"/>
+          <xsl:with-param name="p_show_package_tree" select="0"/>
+          <xsl:with-param name="p_show_full_tree" select="1"/>
+          <xsl:with-param name="p_show_index" select="1"/>
+          <xsl:with-param name="p_show_help" select="1"/>
+          <xsl:with-param name="p_show_deprecated" select="0"/>
+          <xsl:with-param name="p_curr_deprecated" select="1"/>
+          <xsl:with-param name="p_top" select="1"/> 
+        </xsl:call-template>
+
+        <div class="pagebody">
+
+        <h1 class="classdoc-title">Deprecated API</h1>
+
+        <xsl:choose>
+          <xsl:when test="gjdoc:rootdoc/gjdoc:hasDeprecatedInterfaces or gjdoc:rootdoc/gjdoc:hasDeprecatedClasses or gjdoc:rootdoc/gjdoc:hasDeprecatedExceptions or gjdoc:rootdoc/gjdoc:hasDeprecatedErrors or gjdoc:rootdoc/gjdoc:rootdoc/gjdoc:hasDeprecatedMethods or gjdoc:rootdoc/gjdoc:hasDeprecatedFields">
+            <div class="classdoc-tag-section-header">Contents:</div>
+            <dl class="classdoc-list">
+              <xsl:if test="gjdoc:rootdoc/gjdoc:hasDeprecatedInterfaces">
+                <dt><a href="#interfaces">Deprecated Interfaces</a></dt>
+              </xsl:if>
+              <xsl:if test="gjdoc:rootdoc/gjdoc:hasDeprecatedClasses">
+                <dt><a href="#classes">Deprecated Classes</a></dt>
+              </xsl:if>
+              <xsl:if test="gjdoc:rootdoc/gjdoc:hasDeprecatedExceptions">
+                <dt><a href="#exceptions">Deprecated Exceptions</a></dt>
+              </xsl:if>
+              <xsl:if test="gjdoc:rootdoc/gjdoc:hasDeprecatedErrors">
+                <dt><a href="#errors">Deprecated Errors</a></dt>
+              </xsl:if>
+              <xsl:if test="gjdoc:rootdoc/gjdoc:hasDeprecatedFields">
+                <dt><a href="#fields">Deprecated Fields</a></dt>
+              </xsl:if>
+              <xsl:if test="gjdoc:rootdoc/gjdoc:hasDeprecatedMethods">
+                <dt><a href="#methods">Deprecated Methods</a></dt>
+              </xsl:if>
+              <xsl:if test="gjdoc:rootdoc/gjdoc:hasDeprecatedConstructors">
+                <dt><a href="#constructors">Deprecated Constructors</a></dt>
+              </xsl:if>
+            </dl>
+          </xsl:when>
+          <xsl:otherwise>
+            <p>No parts of this API are deprecated.</p>
+          </xsl:otherwise>
+        </xsl:choose>
+
+        <xsl:if test="gjdoc:rootdoc/gjdoc:hasDeprecatedInterfaces">
+          <a name="interfaces"/>
+          <h1 class="classdoc-header">Deprecated Interfaces</h1>
+
+          <xsl:for-each select="gjdoc:rootdoc/gjdoc:classdoc/@qualifiedtypename">
+            <xsl:variable name="v_currentclass" select="."/>
+            <xsl:variable name="v_sub_xml_filename" select="concat(.,'.xml')"/>
+            <xsl:for-each select="document($v_sub_xml_filename,/gjdoc:rootdoc)//gjdoc:classdoc[@qualifiedtypename=$v_currentclass]/@qualifiedtypename/..">
+              <xsl:if test="gjdoc:isInterface">
+                <xsl:call-template name="output-deprecated-class"/>
+              </xsl:if>
+            </xsl:for-each>
+          </xsl:for-each>
+        </xsl:if>
+
+        <xsl:if test="gjdoc:rootdoc/gjdoc:hasDeprecatedClasses">
+          <a name="classes"/>
+          <h1 class="classdoc-header">Deprecated Classes</h1>
+
+          <xsl:for-each select="gjdoc:rootdoc/gjdoc:classdoc/@qualifiedtypename">
+            <xsl:variable name="v_currentclass" select="."/>
+            <xsl:variable name="v_sub_xml_filename" select="concat(.,'.xml')"/>
+            <xsl:for-each select="document($v_sub_xml_filename,/gjdoc:rootdoc)//gjdoc:classdoc[@qualifiedtypename=$v_currentclass]/@qualifiedtypename/..">
+              <xsl:if test="gjdoc:isOrdinaryClass">
+                <xsl:call-template name="output-deprecated-class"/>
+              </xsl:if>
+            </xsl:for-each>
+          </xsl:for-each>
+        </xsl:if>
+
+        <xsl:if test="gjdoc:rootdoc/gjdoc:hasDeprecatedExceptions">
+          <a name="exceptions"/>
+          <h1 class="classdoc-header">Deprecated Exceptions</h1>
+          
+          <xsl:for-each select="gjdoc:rootdoc/gjdoc:classdoc/@qualifiedtypename">
+            <xsl:variable name="v_currentclass" select="."/>
+            <xsl:variable name="v_sub_xml_filename" select="concat(.,'.xml')"/>
+            <xsl:for-each select="document($v_sub_xml_filename,/gjdoc:rootdoc)//gjdoc:classdoc[@qualifiedtypename=$v_currentclass]/.">
+              <xsl:if test="gjdoc:isException">
+                <xsl:call-template name="output-deprecated-class"/>
+              </xsl:if>
+            </xsl:for-each>
+          </xsl:for-each>
+        </xsl:if>
+
+        <xsl:if test="gjdoc:rootdoc/gjdoc:hasDeprecatedErrors">
+          <a name="errors"/>
+          <h1 class="classdoc-header">Deprecated Errors</h1>
+          
+          <xsl:for-each select="gjdoc:rootdoc/gjdoc:classdoc/@qualifiedtypename">
+            <xsl:variable name="v_currentclass" select="."/>
+            <xsl:variable name="v_sub_xml_filename" select="concat(.,'.xml')"/>
+            <xsl:for-each select="document($v_sub_xml_filename,/gjdoc:rootdoc)//gjdoc:classdoc[@qualifiedtypename=$v_currentclass]/.">
+              <xsl:if test="gjdoc:isError">
+                <xsl:call-template name="output-deprecated-class"/>
+              </xsl:if>
+            </xsl:for-each>
+          </xsl:for-each>
+        </xsl:if>
+
+        <xsl:if test="gjdoc:rootdoc/gjdoc:hasDeprecatedFields">
+          <a name="fields"/>
+          <h1 class="classdoc-header">Deprecated Fields</h1>
+
+          <xsl:for-each select="gjdoc:rootdoc/gjdoc:classdoc/@qualifiedtypename">
+            <xsl:variable name="v_currentclass" select="."/>
+            <xsl:variable name="v_sub_xml_filename" select="concat(.,'.xml')"/>
+            <xsl:for-each select="document($v_sub_xml_filename,/gjdoc:rootdoc)//gjdoc:classdoc[@qualifiedtypename=$v_currentclass]/gjdoc:fielddoc/@name">
+              <xsl:call-template name="output-deprecated-member"/>
+            </xsl:for-each>
+          </xsl:for-each>
+        </xsl:if>
+
+        <xsl:if test="gjdoc:rootdoc/gjdoc:hasDeprecatedMethods">
+          <a name="methods"/>
+          <h1 class="classdoc-header">Deprecated Methods</h1>
+
+          <xsl:for-each select="gjdoc:rootdoc/gjdoc:classdoc/@qualifiedtypename">
+            <xsl:variable name="v_currentclass" select="."/>
+            <xsl:variable name="v_sub_xml_filename" select="concat(.,'.xml')"/>
+            <xsl:for-each select="document($v_sub_xml_filename,/gjdoc:rootdoc)//gjdoc:classdoc[@qualifiedtypename=$v_currentclass]/gjdoc:methoddoc/@name">
+              <xsl:call-template name="output-deprecated-member"/>
+            </xsl:for-each>
+          </xsl:for-each>
+        </xsl:if>
+
+        <xsl:if test="gjdoc:rootdoc/gjdoc:hasDeprecatedConstructors">
+          <a name="constructors"/>
+          <h1 class="classdoc-header">Deprecated Constructors</h1>
+          
+          <xsl:for-each select="gjdoc:rootdoc/gjdoc:classdoc/@qualifiedtypename">
+            <xsl:variable name="v_currentclass" select="."/>
+            <xsl:variable name="v_sub_xml_filename" select="concat(.,'.xml')"/>
+            <xsl:for-each select="document($v_sub_xml_filename,/gjdoc:rootdoc)//gjdoc:classdoc[@qualifiedtypename=$v_currentclass]/gjdoc:constructordoc/@name">
+              <xsl:call-template name="output-deprecated-member"/>
+            </xsl:for-each>
+          </xsl:for-each>
+        </xsl:if>
+        <!-- Bottom Navigation Bar -->
+        <xsl:call-template name="output_navbar">
+          <xsl:with-param name="p_show_frames" select="1"/>
+          <xsl:with-param name="p_show_noframes" select="1"/>
+          <xsl:with-param name="p_show_package" select="0"/>
+          <xsl:with-param name="p_show_package_tree" select="0"/>
+          <xsl:with-param name="p_show_full_tree" select="1"/>
+          <xsl:with-param name="p_show_index" select="1"/>
+          <xsl:with-param name="p_show_help" select="1"/>
+          <xsl:with-param name="p_show_deprecated" select="0"/>
+          <xsl:with-param name="p_curr_deprecated" select="1"/>
+          <xsl:with-param name="p_top" select="0"/> 
+        </xsl:call-template>
+
+        </div>
+      </body>
+    </html>
+  </xsl:template>
+
+  <xsl:template name="output-deprecated-member">
+
+    <xsl:if test="../gjdoc:tags/gjdoc:tag[@kind='@deprecated']">
+      <dl>
+        <dt>
+          <a href="{concat($gjdoc.pathtoroot, translate(ancestor::gjdoc:classdoc/gjdoc:containingPackage/@name, '.', '/'), '/', ancestor::gjdoc:classdoc/@name, '.html#', ., ../gjdoc:signature/@full)}">
+            <xsl:value-of select="concat(ancestor::gjdoc:classdoc/@qualifiedtypename, '.', ., ../gjdoc:signature/@flat)"/>
+          </a>
+        </dt>
+        <dd>
+          <xsl:for-each select="../gjdoc:tags/gjdoc:tag[@kind='@deprecated']/gjdoc:firstSentenceTags/node()">
+            <xsl:apply-templates select="."/>
+          </xsl:for-each>
+        </dd>
+      </dl>
+    </xsl:if>
+    
+  </xsl:template>
+
+  <xsl:template name="output-deprecated-class">
+    <xsl:if test="gjdoc:tags/gjdoc:tag[@kind='@deprecated']">
+      <dl>
+        <dt>
+          <a href="{concat($gjdoc.pathtoroot, translate(gjdoc:containingPackage/@name, '.', '/'), '/', @name, '.html')}"><xsl:value-of select="@qualifiedtypename"/></a>
+        </dt>
+        <dd>
+          <xsl:for-each select="gjdoc:tags/gjdoc:tag[@kind='@deprecated']/gjdoc:firstSentenceTags/node()">
+            <xsl:apply-templates select="."/>
+          </xsl:for-each>
+        </dd>
+      </dl>
+    </xsl:if>    
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/descriptor.xsl b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/descriptor.xsl
new file mode 100644
index 0000000..5cdb332
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/descriptor.xsl
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- descriptor.xsl
+     Copyright (C) 2003 Free Software Foundation, Inc.
+     
+     This file is part of GNU Classpath.
+     
+     GNU Classpath is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+      
+     GNU Classpath is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License
+     along with GNU Classpath; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     02111-1307 USA.
+     -->
+
+<!-- Creates the index.html file for HTML documentation. This is only
+     a simple frameset.
+     -->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml"
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns="http://www.w3.org/TR/REC-html40">
+
+  <xsl:include href="html_common.xsl"/>
+
+  <xsl:output method="xml"
+    encoding="utf-8"
+    indent="no"/>
+
+  <xsl:strip-space elements="*"/>
+
+  <xsl:template match="/">
+    <gjdoc:descriptor>
+      <gjdoc:about>
+        This file was generated by Gjdoc <xsl:value-of select="$gjdoc.xmldoclet.version"/>
+        on <xsl:value-of select="document('index.xml', /)/gjdoc:rootdoc/gjdoc:created"/>.
+      
+        <xsl:copy-of select="document('index.xml', /)/gjdoc:rootdoc/gjdoc:bottomnote"/>
+      </gjdoc:about>
+      <xsl:for-each select="/gjdoc:rootdoc/gjdoc:packagedoc">
+        <gjdoc:package name="{@name}"/>
+      </xsl:for-each>
+      <xsl:for-each select="/gjdoc:rootdoc/gjdoc:classdoc">
+        <gjdoc:class name="{@name}" qualifiedtypename="{@qualifiedtypename}"/>
+      </xsl:for-each>
+    </gjdoc:descriptor>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/doctranslet.xsl b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/doctranslet.xsl
new file mode 100644
index 0000000..7008f73
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/doctranslet.xsl
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- outputfiles.xsl
+     Copyright (C) 2003 Free Software Foundation, Inc.
+     
+     This file is part of GNU Classpath.
+     
+     GNU Classpath is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+      
+     GNU Classpath is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License
+     along with GNU Classpath; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     02111-1307 USA.
+     -->
+
+<!-- Returns a list of files generated by this stylesheet complex.
+     -->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml"
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns="http://www.gnu.org/software/cp-tools/gjdocxslfiles">
+
+  <xsl:output method="xml"
+    encoding="utf-8"
+    indent="no"/>
+
+  <xsl:strip-space elements="*"/>
+
+  <xsl:template match="/">
+    <doctranslet>
+
+      <name>GNU Gjdoc HTML DocTranslet</name>
+
+      <version>0.6.1</version>
+
+      <outputtype>
+        <name>HTML</name>
+      </outputtype>
+
+      <outputfile>
+        <name><xsl:text>index.html</xsl:text></name>
+        <type><xsl:text>index</xsl:text></type>
+        <sheet><xsl:text>index.xsl</xsl:text></sheet>
+        <comment><xsl:text>HTML Index file</xsl:text></comment>
+      </outputfile>
+      
+      <outputfile>
+        <name><xsl:text>index_noframes.html</xsl:text></name>
+        <type><xsl:text>index_noframes</xsl:text></type>
+        <sheet><xsl:text>index_noframes.xsl</xsl:text></sheet>
+        <comment><xsl:text>HTML Index file (No Frames)</xsl:text></comment>
+      </outputfile>
+      
+      <outputfile>
+        <name><xsl:text>descriptor.xml</xsl:text></name>
+        <type><xsl:text>descriptor</xsl:text></type>
+        <sheet><xsl:text>descriptor.xsl</xsl:text></sheet>
+        <comment><xsl:text>HTML Descriptor file</xsl:text></comment>
+      </outputfile>
+      
+      <outputfile>
+        <name><xsl:text>allclasses.html</xsl:text></name>
+        <type><xsl:text>allclasses</xsl:text></type>
+        <sheet><xsl:text>allclasses.xsl</xsl:text></sheet>
+        <comment><xsl:text>HTML All Classes file</xsl:text></comment>
+      </outputfile>
+      
+      <outputfile>
+        <name><xsl:text>allpackages.html</xsl:text></name>
+        <type><xsl:text>allpackages</xsl:text></type>
+        <sheet><xsl:text>allpackages.xsl</xsl:text></sheet>
+        <comment><xsl:text>HTML All Packages file</xsl:text></comment>
+      </outputfile>
+
+      <outputfile>
+        <name><xsl:text>fulltree.html</xsl:text></name>
+        <type><xsl:text>fulltree</xsl:text></type>
+        <sheet><xsl:text>fulltree.xsl</xsl:text></sheet>
+        <comment><xsl:text>HTML Tree file</xsl:text></comment>
+      </outputfile>
+
+      <xsl:for-each select="gjdoc:rootdoc/gjdoc:packagedoc">
+        <outputfile>
+          <name><xsl:value-of select="concat(translate(@name,'.','/'),'/package-summary.html')"/></name>
+          <type><xsl:text>package</xsl:text></type>
+          <info><xsl:value-of select="@name"/></info>
+          <sheet><xsl:text>packagedoc.xsl</xsl:text></sheet>
+          <comment><xsl:text>HTML Documentation for package </xsl:text><xsl:value-of select="@name"/></comment>
+        </outputfile>
+      </xsl:for-each>
+
+      <xsl:for-each select="gjdoc:rootdoc/gjdoc:classdoc">
+        <outputfile>
+          <name><xsl:value-of select="concat(translate(gjdoc:containingPackage/@name,'.','/'),'/',@name,'.html')"/></name>
+          <type><xsl:text>class</xsl:text></type>
+          <info><xsl:value-of select="@qualifiedtypename"/></info>
+          <sheet><xsl:text>classdoc.xsl</xsl:text></sheet>
+          <comment><xsl:text>HTML Documentation for </xsl:text><xsl:value-of select="@qualifiedtypename"/></comment>
+        </outputfile>
+      </xsl:for-each>
+
+    </doctranslet>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/fulltree.xsl b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/fulltree.xsl
new file mode 100644
index 0000000..3d60bbb
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/fulltree.xsl
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- fulltree.xsl
+     Copyright (C) 2003 Free Software Foundation, Inc.
+     
+     This file is part of GNU Classpath.
+     
+     GNU Classpath is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+      
+     GNU Classpath is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License
+     along with GNU Classpath; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     02111-1307 USA.
+     -->
+
+<!-- Creates the fulltree.html file for HTML documentation. 
+     -->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml"
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns="http://www.w3.org/TR/REC-html40">
+
+  <xsl:include href="html_common.xsl"/>
+
+  <xsl:output method="xml"
+    encoding="utf-8"
+    indent="no"/>
+
+  <xsl:strip-space elements="*"/>
+
+  <xsl:template name="output_tree_recursive">
+    <xsl:param name="p_level" select="0"/>
+    
+    <xsl:value-of select="gjdoc:containingPackage/@name"/><xsl:text>.</xsl:text><a class="tree-class-link" href="{concat($gjdoc.pathtoroot,translate(gjdoc:containingPackage/@name,'.','/'),'/',@name,'.html')}"><xsl:value-of select="@name"/></a> 
+    <xsl:if test="gjdoc:implements">
+      <xsl:text> (implements </xsl:text>
+      <xsl:for-each select="gjdoc:implements">
+        <xsl:sort select="@qualifiedtypename" order="ascending"/>
+        <xsl:choose>
+          <xsl:when test="string-length($gjdoc.outputfile.info)=0">
+            <xsl:call-template name="link_to_class_full">
+              <xsl:with-param name="p_name" select="@typename"/>
+              <xsl:with-param name="p_qualifiedname" select="@qualifiedtypename"/>
+            </xsl:call-template>            
+          </xsl:when>
+          <xsl:when test="gjdoc:containingPackage/@name=$gjdoc.outputfile.info">
+            <xsl:call-template name="link_to_class">
+              <xsl:with-param name="p_name" select="@typename"/>
+              <xsl:with-param name="p_qualifiedname" select="@qualifiedtypename"/>
+            </xsl:call-template>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name="link_to_class_full">
+              <xsl:with-param name="p_name" select="@typename"/>
+              <xsl:with-param name="p_qualifiedname" select="@qualifiedtypename"/>
+            </xsl:call-template>            
+          </xsl:otherwise>
+        </xsl:choose>
+        <xsl:if test="position() != last()">
+          <xsl:text>, </xsl:text>
+        </xsl:if>
+      </xsl:for-each>
+      <xsl:text>)</xsl:text>
+    </xsl:if>
+
+    <xsl:variable name="v_qualifiedname">
+      <xsl:value-of select="@qualifiedtypename"/>
+    </xsl:variable>
+    <xsl:variable name="v_result">
+    <xsl:for-each select="/gjdoc:rootdoc/gjdoc:classdoc[gjdoc:superclass/@qualifiedtypename=$v_qualifiedname]">
+      <xsl:sort select="@qualifiedtypename" order="ascending"/>
+      <xsl:variable name="v_is_used">
+        <xsl:choose>
+          <xsl:when test="string-length($gjdoc.outputfile.info)=0">
+            <xsl:value-of select="true()"/>            
+          </xsl:when>
+          <xsl:when test="gjdoc:containingPackage/@name=$gjdoc.outputfile.info">
+            <xsl:value-of select="true()"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name="is_class_parent_of_package_class">
+              <xsl:with-param name="p_package" select="$gjdoc.outputfile.info"/>
+              <xsl:with-param name="p_qualifiedtypename" select="@qualifiedtypename"/>
+            </xsl:call-template>            
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+      <xsl:if test="string-length($v_is_used)>0">
+        <li class="tree">
+          <xsl:call-template name="output_tree_recursive">
+            <xsl:with-param name="p_level"><xsl:value-of select="$p_level+1"/></xsl:with-param>
+          </xsl:call-template>
+        </li>
+      </xsl:if>
+    </xsl:for-each>
+  </xsl:variable>
+  <xsl:if test="string-length($v_result)>0">
+    <ul><xsl:copy-of select="$v_result"/></ul>
+  </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="is_class_parent_of_package_class">
+    <xsl:param name="p_package"/>
+    <xsl:param name="p_qualifiedtypename"/>
+
+    <xsl:choose>
+      
+      <xsl:when test="/gjdoc:rootdoc/gjdoc:classdoc[gjdoc:superclass/@qualifiedtypename=$p_qualifiedtypename and gjdoc:containingPackage/@name=$p_package]">
+        <xsl:value-of select="true()"/>
+      </xsl:when>
+
+      <xsl:otherwise>
+        <xsl:for-each select="/gjdoc:rootdoc/gjdoc:classdoc[gjdoc:superclass/@qualifiedtypename=$p_qualifiedtypename]">
+          <xsl:call-template name="is_class_parent_of_package_class">
+            <xsl:with-param name="p_package" select="$p_package"/>
+            <xsl:with-param name="p_qualifiedtypename" select="@qualifiedtypename"/>
+          </xsl:call-template>
+        </xsl:for-each>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="/">
+
+    <html>
+      <head>
+        <xsl:call-template name="output_title">
+          <xsl:with-param name="p_pagetitle" select="'Full Tree'"/>
+        </xsl:call-template>
+        <xsl:call-template name="include_common"/>
+      </head>
+      <body class="classdoc" onload="if(parent.contentPageLoaded)parent.contentPageLoaded(document.title)">
+        <div class="pagebody">
+
+        <!-- Top Navigation Bar -->
+        <xsl:call-template name="output_navbar">
+          <xsl:with-param name="p_show_frames" select="1"/>
+          <xsl:with-param name="p_show_noframes" select="1"/>
+          <xsl:with-param name="p_show_package" select="string-length($gjdoc.outputfile.info)&gt;0"/>
+          <xsl:with-param name="p_show_package_tree" select="0"/>
+          <xsl:with-param name="p_curr_package_tree" select="string-length($gjdoc.outputfile.info)&gt;0"/>
+          <xsl:with-param name="p_show_full_tree" select="string-length($gjdoc.outputfile.info)&gt;0"/>
+          <xsl:with-param name="p_curr_full_tree" select="string-length($gjdoc.outputfile.info)&lt;=0"/>
+          <xsl:with-param name="p_show_index" select="1"/>
+          <xsl:with-param name="p_show_help" select="1"/>
+          <xsl:with-param name="p_top" select="1"/> 
+        </xsl:call-template>
+
+        <h1 class="classdoc-title">
+          <xsl:choose>
+            <xsl:when test="string-length($gjdoc.outputfile.info)=0">
+              Full Class Tree
+              <xsl:if test="/gjdoc:rootdoc/gjdoc:title">
+                <xsl:text> for </xsl:text>
+                <xsl:value-of select="/gjdoc:rootdoc/gjdoc:title"/>
+              </xsl:if>
+            </xsl:when>
+            <xsl:otherwise>
+              Class Hierarchy for Package <xsl:value-of select="$gjdoc.outputfile.info"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </h1>
+
+        <xsl:for-each select="/gjdoc:rootdoc/gjdoc:classdoc[@qualifiedtypename='java.lang.Object']">
+          <ul class="tree">
+            <li class="tree">
+              <xsl:call-template name="output_tree_recursive"/>
+            </li>
+          </ul>
+        </xsl:for-each>
+
+
+        <!-- Bottom Navigation Bar -->
+        <xsl:call-template name="output_navbar">
+          <xsl:with-param name="p_show_frames" select="1"/>
+          <xsl:with-param name="p_show_noframes" select="1"/>
+          <xsl:with-param name="p_show_package" select="string-length($gjdoc.outputfile.info)&lt;=0"/>
+          <xsl:with-param name="p_show_package_tree" select="0"/>
+          <xsl:with-param name="p_curr_package_tree" select="string-length($gjdoc.outputfile.info)&gt;0"/>
+          <xsl:with-param name="p_show_full_tree" select="string-length($gjdoc.outputfile.info)&gt;0"/>
+          <xsl:with-param name="p_curr_full_tree" select="string-length($gjdoc.outputfile.info)&lt;=0"/>
+          <xsl:with-param name="p_show_index" select="1"/>
+          <xsl:with-param name="p_show_help" select="1"/>
+          <xsl:with-param name="p_top" select="0"/> 
+        </xsl:call-template>
+        </div>
+      </body>
+    </html>
+    
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/gjdoc.xsl b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/gjdoc.xsl
new file mode 100644
index 0000000..74558ab
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/gjdoc.xsl
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- outputfiles.xsl
+     Copyright (C) 2003 Free Software Foundation, Inc.
+     
+     This file is part of GNU Classpath.
+     
+     GNU Classpath is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+      
+     GNU Classpath is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License
+     along with GNU Classpath; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     02111-1307 USA.
+     -->
+
+<!-- Returns a list of files generated by this stylesheet complex.
+     -->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml"
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns="http://www.gnu.org/software/cp-tools/gjdocxslfiles">
+
+  <xsl:include href="../gjdoc_common.xsl"/>
+
+  <xsl:output method="xml"
+    encoding="utf-8"
+    indent="no"/>
+
+  <xsl:strip-space elements="*"/>
+
+  <xsl:template match="/">
+    <gjdocoutput>
+
+      <comment><xsl:text>GNU Gjdoc HTML Documentation</xsl:text></comment>
+
+      <outputfile>
+        <name><xsl:text>index.html</xsl:text></name>
+        <sheet><xsl:text>index.xsl</xsl:text></sheet>
+        <comment><xsl:text>HTML Index file</xsl:text></comment>
+      </outputfile>
+      
+      <outputfile>
+        <name><xsl:text>index_noframes.html</xsl:text></name>
+        <sheet><xsl:text>index_noframes.xsl</xsl:text></sheet>
+        <comment><xsl:text>HTML Index file (No Frames)</xsl:text></comment>
+      </outputfile>
+      
+      <outputfile>
+        <name><xsl:text>descriptor.xml</xsl:text></name>
+        <sheet><xsl:text>descriptor.xsl</xsl:text></sheet>
+        <comment><xsl:text>HTML Descriptor file</xsl:text></comment>
+      </outputfile>
+      
+      <outputfile>
+        <name><xsl:text>allclasses.html</xsl:text></name>
+        <sheet><xsl:text>allclasses.xsl</xsl:text></sheet>
+        <comment><xsl:text>HTML All Classes file</xsl:text></comment>
+      </outputfile>
+
+      <xsl:if test="count(gjdoc:rootdoc/gjdoc:packagedoc) > 1">
+        <outputfile>
+          <name><xsl:text>allpackages.html</xsl:text></name>
+          <sheet><xsl:text>allpackages.xsl</xsl:text></sheet>
+          <comment><xsl:text>HTML All Packages file</xsl:text></comment>
+        </outputfile>
+      </xsl:if>
+
+      <xsl:if test="not($gjdoc.option.notree)">
+        <outputfile>
+          <name><xsl:text>fulltree.html</xsl:text></name>
+          <sheet><xsl:text>fulltree.xsl</xsl:text></sheet>
+          <comment><xsl:text>HTML Tree file</xsl:text></comment>
+        </outputfile>
+      </xsl:if>
+
+      <xsl:if test="not($gjdoc.option.noindex)">
+        <xsl:choose>
+          <xsl:when test="$gjdoc.option.splitindex">
+            
+            <outputfile>
+              <name><xsl:text>alphaindex.html</xsl:text></name>
+              <info/>
+              <sheet><xsl:text>alphaindex_chunked.xsl</xsl:text></sheet>
+              <comment><xsl:text>HTML Alphabetical Index (Overview)</xsl:text></comment>
+            </outputfile>
+
+            <xsl:for-each select="document('alphaindex.xml',/)/gjdoc:alphaindex/gjdoc:category">
+              <outputfile>
+                <name><xsl:value-of select="concat('alphaindex_', @letter, '.html')"/></name>
+                <info><xsl:value-of select="@letter"/></info>
+                <sheet><xsl:text>alphaindex_chunked.xsl</xsl:text></sheet>
+                <comment><xsl:value-of select="concat('HTML Alphabetical Index (Letter ', @letter, ')')"/></comment>
+              </outputfile>
+            </xsl:for-each>
+
+          </xsl:when>
+          <xsl:otherwise>
+            <outputfile>
+              <name><xsl:text>alphaindex.html</xsl:text></name>
+              <sheet><xsl:text>alphaindex.xsl</xsl:text></sheet>
+              <comment><xsl:text>HTML Alphabetical Index</xsl:text></comment>
+            </outputfile>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:if>
+
+      <xsl:for-each select="gjdoc:rootdoc/gjdoc:packagedoc">
+        <outputfile>
+          <name><xsl:value-of select="concat(translate(@name,'.','/'),'/package-summary.html')"/></name>
+          <info><xsl:value-of select="@name"/></info>
+          <sheet><xsl:text>packagedoc.xsl</xsl:text></sheet>
+          <comment><xsl:text>HTML Documentation for package </xsl:text><xsl:value-of select="@name"/></comment>
+        </outputfile>
+        <outputfile>
+          <name><xsl:value-of select="concat(translate(@name,'.','/'),'/classes.html')"/></name>
+          <info><xsl:value-of select="@name"/></info>
+          <sheet><xsl:text>packageclasses.xsl</xsl:text></sheet>
+          <comment><xsl:text>HTML Class list for package </xsl:text><xsl:value-of select="@name"/></comment>
+        </outputfile>
+
+        <xsl:if test="not($gjdoc.option.notree)">
+          <outputfile>
+            <name><xsl:value-of select="concat(translate(@name,'.','/'),'/package-tree.html')"/></name>
+            <info><xsl:value-of select="@name"/></info>
+            <sheet><xsl:text>fulltree.xsl</xsl:text></sheet>
+            <comment><xsl:text>HTML Hierarchy for package </xsl:text><xsl:value-of select="@name"/></comment>
+          </outputfile>          
+        </xsl:if>
+      </xsl:for-each>
+
+      <xsl:for-each select="gjdoc:rootdoc/gjdoc:classdoc">
+        <xsl:sort select="@qualifiedtypename" order="ascending"/>
+        <outputfile>
+          <name><xsl:value-of select="concat(translate(gjdoc:containingPackage/@name,'.','/'),'/',@name,'.html')"/></name>
+          <info><xsl:value-of select="@qualifiedtypename"/></info>
+          <sheet><xsl:text>classdoc.xsl</xsl:text></sheet>
+          <comment><xsl:text>HTML Documentation for </xsl:text><xsl:value-of select="@qualifiedtypename"/></comment>
+        </outputfile>
+        
+        <xsl:if test="$gjdoc.option.linksource">
+          <outputfile>
+            <name><xsl:text>src-html/</xsl:text><xsl:value-of select="concat(translate(gjdoc:containingPackage/@name,'.','/'),'/',@name,'.html')"/></name>
+            <info><xsl:value-of select="@qualifiedtypename"/></info>
+            <sheet><xsl:text>classdoc-source.xsl</xsl:text></sheet>
+            <comment><xsl:text>HTML Source for </xsl:text><xsl:value-of select="@qualifiedtypename"/></comment>
+          </outputfile>
+        </xsl:if>
+
+        <xsl:if test="$gjdoc.option.uses">
+          <outputfile>
+            <name><xsl:text>class-use/</xsl:text><xsl:value-of select="concat(translate(gjdoc:containingPackage/@name,'.','/'),'/',@name,'.html')"/></name>
+            <info><xsl:value-of select="@qualifiedtypename"/></info>
+            <sheet><xsl:text>classdoc-uses.xsl</xsl:text></sheet>
+            <comment><xsl:text>usage information for </xsl:text><xsl:value-of select="@qualifiedtypename"/></comment>
+          </outputfile>
+        </xsl:if>
+
+      </xsl:for-each>
+
+      <xsl:choose>
+        <xsl:when test="$gjdoc.option.stylesheetfile">
+          <outputfile>
+            <name><xsl:text>user.css</xsl:text></name>
+              <source><xsl:value-of select="$gjdoc.option.stylesheetfile"/></source>
+            <comment><xsl:text>user-supplied CSS stylesheet</xsl:text></comment>
+          </outputfile>      
+        </xsl:when>
+        <xsl:otherwise>
+          <outputfile>
+            <name><xsl:text>gjdochtml.css</xsl:text></name>
+            <source><xsl:text>res/gjdochtml.css</xsl:text></source>
+            <comment><xsl:text>CSS base stylesheet</xsl:text></comment>
+          </outputfile>      
+          <outputfile>
+            <name><xsl:text>gjdochtml-clean.css</xsl:text></name>
+            <source><xsl:text>res/gjdochtml-clean.css</xsl:text></source>
+            <comment><xsl:text>CSS stylesheet 'Clean'</xsl:text></comment>
+          </outputfile>      
+          <outputfile>
+            <name><xsl:text>gjdochtml-sclara.css</xsl:text></name>
+            <source><xsl:text>res/gjdochtml-sclara.css</xsl:text></source>
+            <comment><xsl:text>CSS stylesheet 'Santa Clara'</xsl:text></comment>
+          </outputfile>      
+          <outputfile>
+            <name><xsl:text>gjdochtml-fixed.css</xsl:text></name>
+            <source><xsl:text>res/gjdochtml-fixed.css</xsl:text></source>
+            <comment><xsl:text>CSS stylesheet 'Fixed'</xsl:text></comment>
+          </outputfile>      
+        </xsl:otherwise>
+      </xsl:choose>
+
+      <outputfile>
+        <name><xsl:text>gjdoc.js</xsl:text></name>
+        <source><xsl:text>res/gjdoc.js</xsl:text></source>
+        <comment><xsl:text>JavaScript helper file</xsl:text></comment>
+      </outputfile>
+
+      <xsl:if test="not($gjdoc.option.nohelp)">
+        <outputfile>
+          <name><xsl:text>help.html</xsl:text></name>
+          <sheet><xsl:text>help.xsl</xsl:text></sheet>
+          <comment><xsl:text>help file</xsl:text></comment>
+        </outputfile>
+      </xsl:if>
+
+      <outputfile>
+        <name><xsl:text>about.html</xsl:text></name>
+        <sheet><xsl:text>about.xsl</xsl:text></sheet>
+        <comment><xsl:text>about file</xsl:text></comment>
+      </outputfile>
+
+      <xsl:if test="not($gjdoc.option.nodeprecatedlist)">
+        <outputfile>
+          <name><xsl:text>deprecated.html</xsl:text></name>
+          <sheet><xsl:text>deprecated.xsl</xsl:text></sheet>
+          <comment><xsl:text>deprecated list</xsl:text></comment>
+        </outputfile>
+      </xsl:if>
+
+      <outputfile>
+        <name><xsl:text>serialized.html</xsl:text></name>
+        <sheet><xsl:text>serialized.xsl</xsl:text></sheet>
+        <comment><xsl:text>serialization information</xsl:text></comment>
+      </outputfile>
+
+    </gjdocoutput>
+  </xsl:template>
+
+</xsl:stylesheet>
+
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/help.xsl b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/help.xsl
new file mode 100644
index 0000000..45af6a6
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/help.xsl
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- help.xsl
+     Copyright (C) 2003 Free Software Foundation, Inc.
+     
+     This file is part of GNU Classpath.
+     
+     GNU Classpath is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+      
+     GNU Classpath is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License
+     along with GNU Classpath; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     02111-1307 USA.
+     -->
+
+<!-- Creates the class descriptor files for HTML documentation. 
+     -->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml"
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns="http://www.w3.org/TR/REC-html40">
+
+  <xsl:include href="html_common.xsl"/>
+
+  <xsl:output method="html"
+    encoding="utf-8"
+    doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
+    doctype-system="http://www.w3.org/TR/html4/loose.dtd"
+    indent="no"/>
+
+  <xsl:strip-space elements="*"/>
+
+  <xsl:template match="/">    
+    <html>
+      <head>
+        <xsl:call-template name="output_title">
+          <xsl:with-param name="p_pagetitle" select="'Help'"/>
+        </xsl:call-template>
+        <xsl:call-template name="include_common"/>
+      </head>
+      <body class="classdoc" onload="if(parent.contentPageLoaded)parent.contentPageLoaded(document.title)">
+        <!-- Top Navigation Bar -->
+        <xsl:call-template name="output_navbar">
+          <xsl:with-param name="p_show_frames" select="1"/>
+          <xsl:with-param name="p_show_noframes" select="1"/>
+          <xsl:with-param name="p_show_package" select="0"/>
+          <xsl:with-param name="p_show_package_tree" select="0"/>
+          <xsl:with-param name="p_show_full_tree" select="1"/>
+          <xsl:with-param name="p_show_index" select="1"/>
+          <xsl:with-param name="p_show_help" select="0"/>
+          <xsl:with-param name="p_curr_help" select="1"/>
+          <xsl:with-param name="p_top" select="1"/>
+        </xsl:call-template>
+
+        <div class="pagebody">
+
+        <xsl:choose>
+          <xsl:when test="$gjdoc.option.helpfile">
+            <xsl:copy-of select="document($gjdoc.option.helpfile)//body"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:copy-of select="document('res/default_help_en.html')"/>
+          </xsl:otherwise>
+        </xsl:choose>
+
+        <!-- Bottom Navigation Bar -->
+        <xsl:call-template name="output_navbar">
+          <xsl:with-param name="p_show_frames" select="1"/>
+          <xsl:with-param name="p_show_noframes" select="1"/>
+          <xsl:with-param name="p_show_package" select="0"/>
+          <xsl:with-param name="p_show_package_tree" select="0"/>
+          <xsl:with-param name="p_show_full_tree" select="1"/>
+          <xsl:with-param name="p_show_index" select="1"/>
+          <xsl:with-param name="p_show_help" select="0"/>
+          <xsl:with-param name="p_curr_help" select="1"/>
+          <xsl:with-param name="p_top" select="0"/> 
+        </xsl:call-template>
+        </div>
+      </body>
+    </html>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/html_common.xsl b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/html_common.xsl
new file mode 100644
index 0000000..4e648d2
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/html_common.xsl
@@ -0,0 +1,584 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- html_common.xsl
+     Copyright (C) 2003 Free Software Foundation, Inc.
+     
+     This file is part of GNU Classpath.
+     
+     GNU Classpath is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+      
+     GNU Classpath is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License
+     along with GNU Classpath; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     02111-1307 USA.
+     -->
+
+<!-- Common templates for HTML generation.
+     -->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml"
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns="http://www.w3.org/TR/REC-html40">
+
+  <xsl:include href="../gjdoc_common.xsl"/>
+
+  <!-- HTML head directives to be included in all generated HTML files. -->
+
+  <xsl:template name="include_common">
+    <script src="{concat($gjdoc.pathtoroot, 'gjdoc.js')}" type="text/javascript"><xsl:comment>this comment required for konqueror 3.2.2</xsl:comment>
+    </script>
+    <xsl:choose>
+      <xsl:when test="$gjdoc.option.stylesheetfile">
+        <link rel="stylesheet" type="text/css" 
+          href="{concat($gjdoc.pathtoroot, 'user.css')}"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <link rel="stylesheet" type="text/css" 
+          href="{concat($gjdoc.pathtoroot, 'gjdochtml.css')}" title="GNU Clean"/>
+        <link rel="stylesheet" type="text/css" 
+          href="{concat($gjdoc.pathtoroot, 'gjdochtml-clean.css')}" title="GNU Clean"/>
+        <link rel="alternate stylesheet" type="text/css" 
+          href="{concat($gjdoc.pathtoroot, 'gjdochtml.css')}" title="Santa Clara"/>
+        <link rel="alternate stylesheet" type="text/css" 
+          href="{concat($gjdoc.pathtoroot, 'gjdochtml-sclara.css')}" title="Santa Clara"/>
+        <link rel="alternate stylesheet" type="text/css" 
+          href="{concat($gjdoc.pathtoroot, 'gjdochtml.css')}" title="Fixed Fruit"/>
+        <link rel="alternate stylesheet" type="text/css" 
+          href="{concat($gjdoc.pathtoroot, 'gjdochtml-fixed.css')}" title="Fixed Fruit"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="output_copyright_footer">
+    <xsl:copy-of select="document('index.xml', /)/gjdoc:rootdoc/gjdoc:bottomnote"/>
+    <hr class="footer"/>
+    <div class="footer">
+      <xsl:text>Generated on</xsl:text><xsl:value-of select="document('index.xml', /)/gjdoc:rootdoc/gjdoc:created"/><xsl:text> by </xsl:text><a href="http://www.gnu.org/software/cp-tools" target="cptoolsinfo"><xsl:text>GNU Classpath Tools</xsl:text></a><xsl:text> (Gjdoc XmlDoclet </xsl:text><xsl:value-of select="$gjdoc.xmldoclet.version"/><xsl:text>).</xsl:text>
+    </div>
+  </xsl:template>
+
+  <!-- If the given class is also included, create a link to it. -->
+  <!-- Otherwise output the qualified name in plain text. -->
+  
+  <xsl:template name="link_to_class_full">
+    <xsl:param name="p_qualifiedname" select="@qualifiedtypename"/>
+    <xsl:variable name="p_classdoc" select="document('index.xml', /)/gjdoc:rootdoc/gjdoc:classdoc[attribute::qualifiedtypename=$p_qualifiedname]"/>
+    <xsl:choose>
+      <xsl:when test="$p_classdoc">
+        <a href="{concat($gjdoc.pathtoroot, translate($p_classdoc/gjdoc:containingPackage/@name, '.', '/'), '/', $p_classdoc/@name, '.html')}">
+          <xsl:value-of select="$p_qualifiedname"/>
+        </a>
+      </xsl:when>
+      <xsl:when test="$gjdoc.refdocs1 and document(concat($gjdoc.refdocs1, '/descriptor.xml'), /)//gjdoc:class[attribute::qualifiedtypename=$p_qualifiedname]">
+        <a href="{concat($gjdoc.refdocs1, '/', $p_qualifiedname, '.html')}">
+          <xsl:value-of select="$p_qualifiedname"/>
+        </a>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$p_qualifiedname"/>
+      </xsl:otherwise>
+    </xsl:choose> 
+  </xsl:template>
+  
+  <!-- If the given class is also included, create a link to it. -->
+  <!-- Otherwise output the qualified name in plain text. -->
+
+  <xsl:template name="link_to_class">
+    <xsl:param name="p_qualifiedname" select="@qualifiedtypename"/>
+    <xsl:param name="p_name" select="@name"/>
+    <xsl:variable name="p_classdoc" select="document('index.xml', /)/gjdoc:rootdoc/gjdoc:classdoc[attribute::qualifiedtypename=$p_qualifiedname]"/>
+    <xsl:choose>
+      <xsl:when test="$p_classdoc">
+        <a href="{concat($gjdoc.pathtoroot, translate($p_classdoc/gjdoc:containingPackage/@name, '.', '/'), '/', $p_classdoc/@name, '.html')}"><xsl:value-of select="$p_name"/></a>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$p_qualifiedname"/>
+      </xsl:otherwise>
+    </xsl:choose> 
+  </xsl:template>
+
+  <xsl:template name="output_alphaindex_category">
+    <dl>
+      <xsl:for-each select="gjdoc:entry">
+        <dt>
+          <xsl:element name="a">
+            <xsl:attribute name="href">
+              <xsl:choose>
+                <xsl:when test="gjdoc:isPackage">
+                  <xsl:value-of select="concat(translate(@name, '.', '/'), '/package-summary.html')"/>
+                </xsl:when>
+                <xsl:when test="gjdoc:isClass and gjdoc:containingClass">
+                  <xsl:value-of select="concat(translate(gjdoc:containingPackage/@name, '.', '/'), '/', gjdoc:containingClass/@name, '.', @name, '.html')"/>
+                </xsl:when>
+                <xsl:when test="gjdoc:isClass">
+                  <xsl:value-of select="concat(translate(gjdoc:containingPackage/@name, '.', '/'), '/', @name, '.html')"/>
+                </xsl:when>
+                <xsl:when test="gjdoc:isMethod">
+                  <xsl:value-of select="concat(translate(gjdoc:containingPackage/@name, '.', '/'), '/', gjdoc:containingClass/@name, '.html#', gjdoc:method/@name, gjdoc:signature/@full)"/>
+                </xsl:when>
+                <xsl:when test="gjdoc:isField">
+                  <xsl:value-of select="concat(translate(gjdoc:containingPackage/@name, '.', '/'), '/', gjdoc:containingClass/@name, '.html#', @name)"/>
+                </xsl:when>
+              </xsl:choose>
+            </xsl:attribute>
+            <xsl:value-of select="@name"/>
+          </xsl:element>
+          -
+          <xsl:choose>
+            <xsl:when test="gjdoc:isPackage">
+              Package
+            </xsl:when>
+            <xsl:when test="gjdoc:isOrdinaryClass and gjdoc:containingClass">
+              Nested class in class
+              <xsl:value-of select="gjdoc:containingClass/@name"/>
+            </xsl:when>
+            <xsl:when test="gjdoc:isException and gjdoc:containingClass">
+              Nested exception in class
+              <xsl:value-of select="gjdoc:containingClass/@name"/>
+            </xsl:when>
+            <xsl:when test="gjdoc:isError and gjdoc:containingClass">
+              Nested error in class
+              <xsl:value-of select="gjdoc:containingClass/@name"/>
+            </xsl:when>
+            <xsl:when test="gjdoc:isInterface and gjdoc:containingClass">
+              Nested interface in class
+              <xsl:value-of select="gjdoc:containingClass/@name"/>
+            </xsl:when>
+            <xsl:when test="gjdoc:isOrdinaryClass">
+              Class in package
+              <xsl:value-of select="gjdoc:containingPackage/@name"/>
+            </xsl:when>
+            <xsl:when test="gjdoc:isException">
+              Exception in package
+              <xsl:value-of select="gjdoc:containingPackage/@name"/>
+            </xsl:when>
+            <xsl:when test="gjdoc:isError">
+              Error in package
+              <xsl:value-of select="gjdoc:containingPackage/@name"/>
+            </xsl:when>
+            <xsl:when test="gjdoc:isInterface">
+              Interface in package
+              <xsl:value-of select="gjdoc:containingPackage/@name"/>
+            </xsl:when>
+            <xsl:when test="gjdoc:isMethod">
+              Method in class
+              <xsl:value-of select="gjdoc:containingClass/@name"/>
+            </xsl:when>
+            <xsl:when test="gjdoc:isField">
+              Field in class
+              <xsl:value-of select="gjdoc:containingClass/@name"/>
+            </xsl:when>
+          </xsl:choose>
+        </dt>
+        <dd>
+          <xsl:for-each select="gjdoc:firstSentenceTags/node()">
+            <xsl:copy-of select="."/>
+          </xsl:for-each>
+        </dd>
+      </xsl:for-each>
+    </dl>
+    
+  </xsl:template>
+
+  <xsl:template name="output_navlink">
+    <xsl:param name="p_href"/>
+    <xsl:param name="p_label"/>
+    <xsl:param name="p_target" select="'_self'"/>
+    <xsl:param name="p_enabled"/>
+    <xsl:param name="p_current"/>
+    <xsl:param name="p_onclick"/>
+    <xsl:param name="p_last" select="0"/>
+    <xsl:param name="p_css_class"/>
+    <xsl:param name="p_title"/>
+
+    <xsl:choose>
+      <xsl:when test="$p_enabled">
+        <span class="navi-button link"><a href="{$p_href}" target="{$p_target}" class="navi-button" title="{$p_title}" onClick="{$p_onclick}"><span class="{concat('navi-link ', $p_css_class)}"><xsl:value-of select="$p_label" disable-output-escaping="yes"/></span></a></span>
+      </xsl:when>
+      <xsl:when test="$p_current">
+        <span class="navi-button current"><xsl:value-of select="$p_label" disable-output-escaping="yes"/></span>
+      </xsl:when>
+      <xsl:otherwise>
+        <span class="navi-button unavailable"><xsl:value-of select="$p_label" disable-output-escaping="yes"/></span>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:if test="not($p_last)"><span class="navsep"><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></span></xsl:if>
+  </xsl:template>
+
+  <xsl:template name="output_navbar">
+    <xsl:param name="p_show_frames" select="1"/>
+    <xsl:param name="p_curr_frames"/>
+
+    <xsl:param name="p_show_noframes" select="1"/>
+    <xsl:param name="p_curr_noframes"/>
+
+    <xsl:param name="p_show_package" select="1"/>
+    <xsl:param name="p_curr_package"/>
+
+    <xsl:param name="p_show_package_tree" select="1"/>
+    <xsl:param name="p_curr_package_tree"/>
+
+    <xsl:param name="p_show_full_tree" select="1"/>
+    <xsl:param name="p_curr_full_tree"/>
+
+    <xsl:param name="p_show_index" select="1"/>
+    <xsl:param name="p_curr_index"/>
+
+    <xsl:param name="p_show_help" select="1"/>
+    <xsl:param name="p_curr_help"/>
+
+    <xsl:param name="p_show_about" select="1"/>
+    <xsl:param name="p_curr_about"/>
+
+    <xsl:param name="p_show_source" select="1"/>
+    <xsl:param name="p_curr_source"/>
+
+    <xsl:param name="p_show_class"/>
+    <xsl:param name="p_curr_class"/>
+
+    <xsl:param name="p_show_use"/>
+    <xsl:param name="p_curr_use"/>
+
+    <xsl:param name="p_show_deprecated" select="1"/>
+    <xsl:param name="p_curr_deprecated"/>
+
+    <xsl:param name="p_top"/>
+
+    <xsl:variable name="v_navbar_class">
+      <xsl:choose>
+        <xsl:when test="$p_top">
+          <xsl:value-of select="'navbar top'"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="'navbar bottom'"/>          
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:if test="not($gjdoc.option.nonavbar)">
+      <div class="{$v_navbar_class}">
+      <table border="1" cellspacing="0" class="{$v_navbar_class}">
+        <tr class="{$v_navbar_class}">
+          <td class="{$v_navbar_class}">
+            <div class="navbar-first-row">
+              <xsl:call-template name="output_navlink">
+                <xsl:with-param name="p_href" select="concat($gjdoc.pathtoroot, 'index_noframes.html')"/>
+                <xsl:with-param name="p_label" select="'Overview'"/>
+                <xsl:with-param name="p_enabled" select="$p_show_noframes"/>
+                <xsl:with-param name="p_current" select="$p_curr_noframes"/>
+              </xsl:call-template>
+              <xsl:call-template name="output_navlink">
+                <xsl:with-param name="p_href" select="'package-summary.html'"/>
+                <xsl:with-param name="p_label" select="'Package'"/>
+                <xsl:with-param name="p_enabled" select="$p_show_package"/>
+                <xsl:with-param name="p_current" select="$p_curr_package"/>
+              </xsl:call-template>
+              <xsl:call-template name="output_navlink">
+                <xsl:with-param name="p_href" select="$p_show_class"/>
+                <xsl:with-param name="p_label" select="'Class'"/>
+                <xsl:with-param name="p_enabled" select="$p_show_class"/>
+                <xsl:with-param name="p_current" select="$p_curr_class"/>
+              </xsl:call-template>
+              <xsl:if test="$gjdoc.option.linksource">
+                <xsl:call-template name="output_navlink">
+                  <xsl:with-param name="p_href" select="$p_show_source"/>
+                  <xsl:with-param name="p_label" select="'Source'"/>
+                  <xsl:with-param name="p_enabled" select="$p_show_source"/>
+                  <xsl:with-param name="p_current" select="$p_curr_source"/>
+                </xsl:call-template>
+              </xsl:if>
+              <xsl:if test="$gjdoc.option.uses">
+                <xsl:call-template name="output_navlink">
+                  <xsl:with-param name="p_href" select="$p_show_use"/>
+                  <xsl:with-param name="p_label" select="'Use'"/>
+                  <xsl:with-param name="p_enabled" select="$p_show_use"/>
+                  <xsl:with-param name="p_current" select="$p_curr_use"/>
+              </xsl:call-template>
+              </xsl:if>
+              <xsl:call-template name="output_navlink">
+                <xsl:with-param name="p_href" select="'package-tree.html'"/>
+                <xsl:with-param name="p_label" select="'Tree'"/>
+                <xsl:with-param name="p_enabled" select="$p_show_package_tree"/>
+                <xsl:with-param name="p_current" select="$p_curr_package_tree"/>
+              </xsl:call-template>
+              <xsl:if test="not($gjdoc.option.noindex)">
+                <xsl:call-template name="output_navlink">
+                  <xsl:with-param name="p_href" select="concat($gjdoc.pathtoroot, 'alphaindex.html')"/>
+                  <xsl:with-param name="p_label" select="'Index'"/>
+                  <xsl:with-param name="p_enabled" select="$p_show_index"/>
+                  <xsl:with-param name="p_current" select="$p_curr_index"/>
+                </xsl:call-template>
+              </xsl:if>
+              <xsl:if test="not($gjdoc.option.notree)">
+                <xsl:call-template name="output_navlink">
+                  <xsl:with-param name="p_href" select="concat($gjdoc.pathtoroot, 'fulltree.html')"/>
+                  <xsl:with-param name="p_label" select="'Full&amp;nbsp;Tree'"/>
+                  <xsl:with-param name="p_enabled" select="$p_show_full_tree"/>
+                  <xsl:with-param name="p_current" select="$p_curr_full_tree"/>
+                </xsl:call-template>
+              </xsl:if>
+              <xsl:if test="not($gjdoc.option.nodeprecatedlist)">
+                <xsl:call-template name="output_navlink">
+                  <xsl:with-param name="p_href" select="concat($gjdoc.pathtoroot, 'deprecated.html')"/>
+                  <xsl:with-param name="p_label" select="'Deprecated'"/>
+                  <xsl:with-param name="p_enabled" select="$p_show_deprecated"/>
+                  <xsl:with-param name="p_current" select="$p_curr_deprecated"/>
+                </xsl:call-template>
+              </xsl:if>
+              <xsl:if test="not($gjdoc.option.nohelp)">
+                <xsl:call-template name="output_navlink">
+                  <xsl:with-param name="p_href" select="concat($gjdoc.pathtoroot, 'help.html')"/>
+                  <xsl:with-param name="p_label" select="'Help'"/>
+                  <xsl:with-param name="p_enabled" select="$p_show_help"/>
+                  <xsl:with-param name="p_current" select="$p_curr_help"/>
+                </xsl:call-template>
+              </xsl:if>
+              <xsl:call-template name="output_navlink">
+                <xsl:with-param name="p_href" select="concat($gjdoc.pathtoroot, 'about.html')"/>
+                <xsl:with-param name="p_label" select="'About'"/>
+                <xsl:with-param name="p_enabled" select="$p_show_about"/>
+                <xsl:with-param name="p_current" select="$p_curr_about"/>
+                <xsl:with-param name="p_last" select="1"/>
+              </xsl:call-template>
+            </div>
+            <div class="navbar-second-row">
+              <xsl:call-template name="output_navlink">
+                <xsl:with-param name="p_href" select="concat($gjdoc.pathtoroot, 'index.html')"/>
+                <xsl:with-param name="p_label" select="'Frames'"/>
+                <xsl:with-param name="p_enabled" select="1"/>
+                <xsl:with-param name="p_target" select="'_top'"/>
+              </xsl:call-template>
+              <xsl:call-template name="output_navlink">
+                <xsl:with-param name="p_href" select="concat($gjdoc.pathtoroot, 'index_noframes.html')"/>
+                <xsl:with-param name="p_label" select="'No&amp;nbsp;Frames'"/>
+                <xsl:with-param name="p_enabled" select="1"/>
+                <xsl:with-param name="p_target" select="'_top'"/>
+                <xsl:with-param name="p_last" select="0"/>
+              </xsl:call-template>
+                <xsl:call-template name="output_navlink">
+                  <xsl:with-param name="p_onclick" select="'return setStyleSheet(&quot;GNU Clean&quot;);'"/>
+                  <xsl:with-param name="p_title" select="'GNU Clean Style'"/>
+                  <xsl:with-param name="p_label" select="'GNU Clean'"/>
+                  <xsl:with-param name="p_enabled" select="1"/>
+                  <xsl:with-param name="p_last" select="0"/>
+                </xsl:call-template>
+                <xsl:call-template name="output_navlink">
+                  <xsl:with-param name="p_onclick" select="'return setStyleSheet(&quot;Santa Clara&quot;);'"/>
+                  <xsl:with-param name="p_title" select="'Santa Clara Style'"/>
+                  <xsl:with-param name="p_label" select="'Santa Clara'"/>
+                  <xsl:with-param name="p_enabled" select="1"/>
+                  <xsl:with-param name="p_last" select="0"/>
+                </xsl:call-template>
+                <xsl:call-template name="output_navlink">
+                  <xsl:with-param name="p_onclick" select="'return setStyleSheet(&quot;Fixed Fruit&quot;);'"/>
+                  <xsl:with-param name="p_title" select="'Fixed Fruit Style'"/>
+                  <xsl:with-param name="p_label" select="'Fixed Fruit'"/>
+                  <xsl:with-param name="p_enabled" select="1"/>
+                  <xsl:with-param name="p_last" select="0"/>
+                </xsl:call-template>
+                <xsl:call-template name="output_navlink">
+                  <xsl:with-param name="p_onclick" select="'return setStyleSheet(&quot;Vanilla&quot;);'"/>
+                  <xsl:with-param name="p_title" select="'Vanilla Style'"/>
+                  <xsl:with-param name="p_label" select="'Vanilla'"/>
+                  <xsl:with-param name="p_enabled" select="1"/>
+                  <xsl:with-param name="p_last" select="0"/>
+                </xsl:call-template>
+
+            </div>
+          </td>
+          <xsl:choose>
+            <xsl:when test="$p_top">
+              <xsl:if test="$gjdoc.option.header">
+                <td class="{$v_navbar_class} navbar-header">
+                  <xsl:value-of select="$gjdoc.option.header"/>
+                </td>
+              </xsl:if>
+            </xsl:when>
+            <xsl:otherwise>              
+              <xsl:if test="$gjdoc.option.footer">
+                <td class="{$v_navbar_class} navbar-footer">
+                  <xsl:value-of select="$gjdoc.option.footer"/>
+                </td>
+              </xsl:if>
+            </xsl:otherwise>
+          </xsl:choose>
+
+        </tr>
+      </table>
+
+      </div>
+      <xsl:if test="not($p_top) and $gjdoc.option.bottom">
+        <hr/>
+        <xsl:value-of select="$gjdoc.option.bottom"/>
+      </xsl:if>     
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="link_to_class_source">
+    <xsl:choose>
+      <xsl:when test="$gjdoc.option.linksource">
+        <a href="{concat($gjdoc.pathtoroot, 'src-html/', translate(gjdoc:containingPackage/@name, '.', '/'), '/', @name, '.html')}"><b><xsl:value-of select="@name"/></b></a>
+      </xsl:when>
+      <xsl:otherwise>
+        <b><xsl:value-of select="@name"/></b>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="link_to_member_source">
+    <xsl:choose>
+      <xsl:when test="$gjdoc.option.linksource">
+        <a href="{concat($gjdoc.pathtoroot, 'src-html/', translate(gjdoc:containingPackage/@name, '.', '/'), '/', gjdoc:containingClass/@typename, '.html#line.', gjdoc:position/@line)}"><b><xsl:value-of select="@name"/></b></a>
+      </xsl:when>
+      <xsl:otherwise>
+        <b><xsl:value-of select="@name"/></b>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="output_title">
+    <xsl:param name="p_pagetitle"/>
+    <xsl:variable name="v_title">
+      <xsl:value-of select="$p_pagetitle"/>
+      <xsl:if test="$gjdoc.option.windowtitle">
+        <xsl:text> (</xsl:text>
+        <xsl:value-of select="$gjdoc.option.windowtitle"/>
+        <xsl:text>)</xsl:text>
+      </xsl:if>      
+    </xsl:variable>
+    <title>
+      <xsl:value-of select="$v_title"/>
+    </title>
+  </xsl:template>
+
+  <xsl:template name="get_qualified_type">
+    <xsl:param name="p_typename"/>
+    <xsl:variable name="v_plaintype">
+      <xsl:choose>
+        <xsl:when test="contains($p_typename,'[')">
+          <xsl:value-of select="normalize-space(substring-before($p_typename, '['))"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="$p_typename"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="v_containingpackage">
+      <xsl:value-of select="ancestor-or-self::gjdoc:classdoc/gjdoc:containingPackage/attribute::name"/>
+    </xsl:variable>
+    <xsl:choose>
+      <xsl:when test="document('index.xml', /)/gjdoc:rootdoc/gjdoc:classdoc[attribute::name=$v_plaintype]/gjdoc:containingPackage[attribute::name=$v_containingpackage]">
+        <xsl:value-of select="$v_containingpackage"/>
+        <xsl:text>.</xsl:text>
+      </xsl:when>
+      <xsl:when test="document('index.xml', /)/gjdoc:rootdoc/gjdoc:classdoc[attribute::name=$v_plaintype]/gjdoc:containingPackage[attribute::name='java.lang']">
+        <xsl:text>java.lang.</xsl:text>
+      </xsl:when>
+    </xsl:choose>
+    <xsl:value-of select="$p_typename"/>
+  </xsl:template>
+
+
+  <xsl:template name="output_link_tag">
+    <xsl:param name="p_contexturl"/>
+    <xsl:variable name="v_see">
+      <xsl:choose>
+        <xsl:when test="contains(., '(')">
+          <xsl:value-of select="normalize-space(substring-before(., '('))"/>
+          <xsl:text>(</xsl:text>
+          <xsl:call-template name="resolve_parameter_list">
+            <xsl:with-param name="p_anchor">
+              <xsl:value-of select="normalize-space(substring-before(substring-after(., '('), ')'))"/>
+            </xsl:with-param>
+          </xsl:call-template>
+          <xsl:text>)</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="."/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="v_class">
+      <xsl:choose>
+        <xsl:when test="contains(., '#')">
+          <xsl:value-of select="normalize-space(substring-before(., '#'))"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="normalize-space(.)"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="v_anchor" select="normalize-space(substring-after(., '#'))"/>
+    <xsl:variable name="v_seeanchor">
+      <xsl:if test="contains($v_see, '#')">
+        <xsl:value-of select="concat('#', normalize-space(substring-after($v_see, '#')))"/>
+      </xsl:if>
+    </xsl:variable>
+    <xsl:variable name="v_classname" select="document('index.xml', /)/gjdoc:rootdoc/gjdoc:classdoc[attribute::name=$v_class]/attribute::qualifiedtypename"/>
+    <xsl:variable name="v_classnamefq" select="document('index.xml', /)/gjdoc:rootdoc/gjdoc:classdoc[attribute::qualifiedtypename=$v_class]/attribute::qualifiedtypename"/>
+    <xsl:choose>
+      <xsl:when test="starts-with(., '#')">
+        <xsl:choose>
+          <xsl:when test="$p_contexturl">
+            <a href="{concat($p_contexturl, translate($v_see,' ',''))}"><xsl:value-of select="$v_anchor"/></a>            
+          </xsl:when>
+          <xsl:otherwise>
+            <a href="{translate($v_see,' ','')}"><xsl:value-of select="$v_anchor"/></a>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
+      <xsl:when test="$v_classname">
+        <a href="{translate(concat($gjdoc.pathtoroot, translate($v_classname, '.', '/'), '.html', $v_seeanchor),' ','')}"><xsl:value-of select="translate($v_see,'#','.')"/></a>
+      </xsl:when>
+      <xsl:when test="$v_classnamefq">
+        <a href="{translate(concat($gjdoc.pathtoroot, translate($v_classnamefq, '.', '/'), '.html', $v_seeanchor),' ','')}"><xsl:value-of select="translate($v_see,'#','.')"/></a>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="translate(., '#', '.')" disable-output-escaping="yes"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="resolve_parameter_list">
+    <xsl:param name="p_anchor"/>
+    <xsl:variable name="v_parameter">
+      <xsl:value-of select="normalize-space(substring-before($p_anchor, ','))"/>
+    </xsl:variable>
+    <xsl:variable name="v_remainder">
+      <xsl:value-of select="normalize-space(substring-after($p_anchor, ','))"/>
+    </xsl:variable>
+    <xsl:call-template name="get_qualified_type">
+      <xsl:with-param name="p_typename">
+        <xsl:choose>
+          <xsl:when test="string-length($v_remainder)>0">
+            <xsl:value-of select="$v_parameter"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="$p_anchor"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:with-param>
+    </xsl:call-template>
+
+    <xsl:if test="string-length($v_remainder)>0">
+      <xsl:text>,</xsl:text>
+      <xsl:call-template name="resolve_parameter_list">
+        <xsl:with-param name="p_anchor">
+          <xsl:value-of select="$v_remainder"/>
+        </xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+</xsl:stylesheet>
+
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/index.xsl b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/index.xsl
new file mode 100644
index 0000000..da4ff62
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/index.xsl
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- index.xsl
+     Copyright (C) 2003 Free Software Foundation, Inc.
+     
+     This file is part of GNU Classpath.
+     
+     GNU Classpath is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+      
+     GNU Classpath is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License
+     along with GNU Classpath; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     02111-1307 USA.
+     -->
+
+<!-- Creates the index.html file for HTML documentation. This is only
+     a simple frameset.
+     -->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml"
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns="http://www.w3.org/TR/REC-html40">
+
+  <xsl:include href="html_common.xsl"/>
+
+  <xsl:output method="html"
+    encoding="utf-8"
+    doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
+    doctype-system="http://www.w3.org/TR/html4/loose.dtd"
+    indent="no"/>
+
+  <xsl:strip-space elements="*"/>
+
+  <xsl:template match="/">
+    <html>
+      <head>
+        <xsl:call-template name="include_common"/>
+      </head>
+      <frameset cols="20%,80%">
+        <xsl:choose>
+          <xsl:when test="count(/gjdoc:rootdoc/gjdoc:packagedoc) > 1">
+            <frameset rows="25%,75%">
+              <frame src="allpackages.html" name="packages"/>
+              <frame src="allclasses.html" name="classes"/>
+            </frameset>
+            <frame src="index_noframes.html" name="content"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <frame src="allclasses.html" name="classes"/>
+            <frame src="{concat(translate(/gjdoc:rootdoc/gjdoc:packagedoc[position()=1]/@name, '.', '/'), '/package-summary.html')}" name="content"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </frameset>
+    </html>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/index_noframes.xsl b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/index_noframes.xsl
new file mode 100644
index 0000000..ab45102
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/index_noframes.xsl
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- index_noframes.xsl
+     Copyright (C) 2003 Free Software Foundation, Inc.
+     
+     This file is part of GNU Classpath.
+     
+     GNU Classpath is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+      
+     GNU Classpath is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License
+     along with GNU Classpath; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     02111-1307 USA.
+     -->
+
+<!-- Creates the index.html file for HTML documentation. This is only
+     a simple frameset.
+     -->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml"
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns="http://www.w3.org/TR/REC-html40">
+
+  <xsl:include href="html_common.xsl"/>
+
+  <xsl:output method="xml"
+    encoding="utf-8"
+    doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
+    doctype-system="http://www.w3.org/TR/html4/loose.dtd"
+    indent="no"/>
+
+  <xsl:strip-space elements="*"/>
+
+  <xsl:template name="output_packagedoc_tr">
+    <tr>
+      <td class="package-link">
+        <a href="{concat(translate(@name,'.','/'), '/package-summary.html')}" class="package-link">
+          <xsl:value-of select="@name"/>
+        </a>
+      </td>
+      <td class="package-summary-description">
+        <xsl:apply-templates select="./gjdoc:firstSentenceTags/node()"/>
+      </td>
+    </tr>
+  </xsl:template>
+
+  <xsl:template match="/">
+      <html>
+        <head>
+          <xsl:call-template name="output_title">
+            <xsl:with-param name="p_pagetitle" select="'Overview'"/>
+          </xsl:call-template>
+          <xsl:call-template name="include_common"/>
+        </head>
+        <body class="classdoc" onload="if(parent.contentPageLoaded)parent.contentPageLoaded(document.title)">
+
+          <!-- Top Navigation Bar -->
+          <xsl:call-template name="output_navbar">
+            <xsl:with-param name="p_show_frames" select="1"/>
+            <xsl:with-param name="p_show_noframes" select="0"/>
+            <xsl:with-param name="p_curr_noframes" select="1"/>
+            <xsl:with-param name="p_show_package" select="0"/>
+            <xsl:with-param name="p_show_package_tree" select="0"/>
+            <xsl:with-param name="p_show_full_tree" select="1"/>
+            <xsl:with-param name="p_show_index" select="1"/>
+            <xsl:with-param name="p_show_help" select="1"/>
+            <xsl:with-param name="p_top" select="1"/> 
+          </xsl:call-template>
+
+          <div class="pagebody">
+
+          <xsl:if test="$gjdoc.option.doctitle">
+            <h1 class="overview-doctitle"><xsl:value-of select="$gjdoc.option.doctitle"/></h1>
+          </xsl:if>
+          <xsl:if test="/gjdoc:rootdoc/gjdoc:firstSentenceTags">
+            <div class="overview-description-top">
+              <xsl:for-each select="/gjdoc:rootdoc/gjdoc:firstSentenceTags/node()">
+                <xsl:copy-of select="."/>
+              </xsl:for-each>
+            </div>
+            <div class="classdoc-tag-section-header">See Also:</div>
+            <dl class="classdoc-list">
+              <dt><a href="#description">Description</a></dt>
+            </dl>
+          </xsl:if>
+
+          <xsl:choose>
+            <xsl:when test="/gjdoc:rootdoc/gjdoc:packagegroup">
+              <xsl:for-each select="/gjdoc:rootdoc/gjdoc:packagegroup">
+                <h1 class="classdoc-title"><xsl:value-of select="@name"/></h1>
+                <table border="1" cellspacing="0" class="classdoc-table">
+                  <xsl:for-each select="gjdoc:package">
+                    <xsl:variable name="v_name" select="@name"/>
+                    <xsl:for-each select="/gjdoc:rootdoc/gjdoc:packagedoc[@name=$v_name]">
+                      <xsl:call-template name="output_packagedoc_tr"/>
+                    </xsl:for-each>
+                  </xsl:for-each>
+                </table>
+              </xsl:for-each>
+            </xsl:when>
+            <xsl:otherwise>
+              <h1 class="classdoc-title">All Packages</h1>
+              <table border="1" cellspacing="0" class="classdoc-table">
+                <xsl:for-each select="/gjdoc:rootdoc/gjdoc:packagedoc">
+                  <xsl:call-template name="output_packagedoc_tr"/>
+                </xsl:for-each>
+              </table>
+            </xsl:otherwise>
+          </xsl:choose>
+          <xsl:if test="/gjdoc:rootdoc/gjdoc:inlineTags">
+            <a name="description"/>
+            <div class="overview-description-full">
+              <xsl:for-each select="/gjdoc:rootdoc/gjdoc:inlineTags/node()">
+                <xsl:copy-of select="."/>
+              </xsl:for-each>
+            </div>
+          </xsl:if>
+          </div>
+          
+          <!-- Bottom Navigation Bar -->
+          <xsl:call-template name="output_navbar">
+            <xsl:with-param name="p_show_frames" select="1"/>
+            <xsl:with-param name="p_show_noframes" select="0"/>
+            <xsl:with-param name="p_curr_noframes" select="1"/>
+            <xsl:with-param name="p_show_package" select="0"/>
+            <xsl:with-param name="p_show_package_tree" select="0"/>
+            <xsl:with-param name="p_show_full_tree" select="1"/>
+            <xsl:with-param name="p_show_index" select="1"/>
+            <xsl:with-param name="p_show_help" select="1"/>
+            <xsl:with-param name="p_top" select="0"/> 
+          </xsl:call-template>
+
+        </body>
+      </html>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/packageclasses.xsl b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/packageclasses.xsl
new file mode 100644
index 0000000..430b944
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/packageclasses.xsl
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- packageclasses.xsl
+     Copyright (C) 2003 Free Software Foundation, Inc.
+     
+     This file is part of GNU Classpath.
+     
+     GNU Classpath is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+      
+     GNU Classpath is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License
+     along with GNU Classpath; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     02111-1307 USA.
+     -->
+
+<!-- Creates the package descriptor files for HTML documentation. 
+     -->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml"
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns="http://www.w3.org/TR/REC-html40">
+
+  <xsl:include href="html_common.xsl"/>
+
+  <xsl:output method="xml"
+    encoding="utf-8"
+    indent="no"/>
+
+  <xsl:strip-space elements="*"/>
+
+  <xsl:template name="add_link_to_class">
+    <a href="{concat(@name, '.html')}" target="content" class="menu packageclasses">
+      <xsl:choose>
+        <xsl:when test="gjdoc:isInterface">
+          <i><xsl:value-of select="@name"/></i>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="@name"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </a><br/>
+  </xsl:template>
+
+  <xsl:template match="/">
+
+    <html>
+      <head>
+        <title>
+          <xsl:value-of select="concat(/gjdoc:rootdoc/gjdoc:title, ' - ', 'Classes in ', $gjdoc.outputfile.info)"/>
+        </title>
+        <xsl:call-template name="include_common"/>
+      </head>
+      <body onload="secondaryPageLoaded('classes');" class="menu packageclasses">
+        <h3 class="menu-title"><a href="package-summary.html" target="content"><xsl:value-of select="$gjdoc.outputfile.info"/></a></h3>
+        <xsl:for-each select="/gjdoc:rootdoc/gjdoc:classdoc[gjdoc:containingPackage/@name=$gjdoc.outputfile.info and not(child::gjdoc:isError or child::gjdoc:isException)]">
+          <xsl:sort select="@name" order="ascending"/>
+          <xsl:call-template name="add_link_to_class"/>
+        </xsl:for-each>
+
+        <xsl:if test="/gjdoc:rootdoc/gjdoc:classdoc[gjdoc:containingPackage/@name=$gjdoc.outputfile.info and child::gjdoc:isException]">
+          <h3><xsl:value-of select="$gjdoc.outputfile.info"/> Exceptions</h3>
+          <xsl:for-each select="/gjdoc:rootdoc/gjdoc:classdoc[gjdoc:containingPackage/@name=$gjdoc.outputfile.info and child::gjdoc:isException]">
+            <xsl:sort select="@name" order="ascending"/>
+            <xsl:call-template name="add_link_to_class"/>
+          </xsl:for-each>
+        </xsl:if>
+
+        <xsl:if test="/gjdoc:rootdoc/gjdoc:classdoc[gjdoc:containingPackage/@name=$gjdoc.outputfile.info and child::gjdoc:isError]">
+          <h3><xsl:value-of select="$gjdoc.outputfile.info"/> Errors</h3>
+          <xsl:for-each select="/gjdoc:rootdoc/gjdoc:classdoc[gjdoc:containingPackage/@name=$gjdoc.outputfile.info and child::gjdoc:isError]">
+            <xsl:sort select="@name" order="ascending"/>
+            <xsl:call-template name="add_link_to_class"/>
+          </xsl:for-each>
+        </xsl:if>
+      </body>
+    </html>
+    
+  </xsl:template>
+  
+</xsl:stylesheet>
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/packagedoc.xsl b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/packagedoc.xsl
new file mode 100644
index 0000000..afe6fb7
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/packagedoc.xsl
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- packagedoc.xsl
+     Copyright (C) 2003 Free Software Foundation, Inc.
+     
+     This file is part of GNU Classpath.
+     
+     GNU Classpath is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+      
+     GNU Classpath is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License
+     along with GNU Classpath; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     02111-1307 USA.
+     -->
+
+<!-- Creates the package descriptor files for HTML documentation. 
+     -->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml"
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns="http://www.w3.org/TR/REC-html40">
+
+  <xsl:include href="html_common.xsl"/>
+
+  <xsl:output method="xml"
+    encoding="utf-8"
+    indent="no"/>
+
+  <xsl:strip-space elements="*"/>
+
+  <xsl:template match="/">
+
+    <html>
+      <head>
+        <xsl:call-template name="output_title">
+          <xsl:with-param name="p_pagetitle" select="$gjdoc.outputfile.info"/>
+        </xsl:call-template>
+        <xsl:call-template name="include_common"/>
+      </head>
+      <body class="classdoc" onload="if(parent.contentPageLoaded)parent.contentPageLoaded(getTitle())">
+
+        <!-- Top Navigation Bar -->
+        <xsl:call-template name="output_navbar">
+          <xsl:with-param name="p_show_package" select="0"/>
+          <xsl:with-param name="p_curr_package" select="1"/>
+          <xsl:with-param name="p_show_package_tree" select="1"/>
+          <xsl:with-param name="p_top" select="1"/> 
+        </xsl:call-template>
+
+        <div class="pagebody">
+
+        <h1 class="classdoc-title">Package <xsl:value-of select="$gjdoc.outputfile.info"/></h1>
+
+        <div class="classdoc-package-comment-body">
+          <xsl:apply-templates select="/gjdoc:rootdoc/gjdoc:packagedoc[@name=$gjdoc.outputfile.info]/gjdoc:firstSentenceTags/node()"/>
+        </div>
+
+        <xsl:if test="/gjdoc:rootdoc/gjdoc:classdoc[gjdoc:containingPackage/@name=$gjdoc.outputfile.info][gjdoc:isInterface]">
+          <table border="1" cellspacing="0" width="100%" class="classdoc-table">
+            <tr><td colspan="2" class="section-header"><div class="section-header">Interface Summary</div></td></tr>
+            <xsl:for-each select="/gjdoc:rootdoc/gjdoc:classdoc[gjdoc:containingPackage/@name=$gjdoc.outputfile.info][gjdoc:isInterface]">
+              <xsl:sort select="@name" order="ascending"/>
+              <xsl:call-template name="output-classes-summary"/>
+            </xsl:for-each>
+          </table>          
+        </xsl:if>
+
+        <xsl:if test="/gjdoc:rootdoc/gjdoc:classdoc[gjdoc:containingPackage/@name=$gjdoc.outputfile.info][gjdoc:isOrdinaryClass]">
+          <table border="1" cellspacing="0" width="100%" class="classdoc-table">
+            <tr><td colspan="2" class="section-header"><div class="section-header">Class Summary</div></td></tr>
+            <xsl:for-each select="/gjdoc:rootdoc/gjdoc:classdoc[gjdoc:containingPackage/@name=$gjdoc.outputfile.info][gjdoc:isOrdinaryClass]">
+              <xsl:sort select="@name" order="ascending"/>
+              <xsl:call-template name="output-classes-summary"/>
+            </xsl:for-each>
+          </table>
+        </xsl:if>
+
+        <xsl:if test="/gjdoc:rootdoc/gjdoc:classdoc[gjdoc:containingPackage/@name=$gjdoc.outputfile.info][gjdoc:isException]">
+          <table border="1" cellspacing="0" width="100%" class="classdoc-table">
+            <tr><td colspan="2" class="section-header"><div class="section-header">Exception Summary</div></td></tr>
+            <xsl:for-each select="/gjdoc:rootdoc/gjdoc:classdoc[gjdoc:containingPackage/@name=$gjdoc.outputfile.info][gjdoc:isException]">
+              <xsl:sort select="@name" order="ascending"/>
+              <xsl:call-template name="output-classes-summary"/>
+            </xsl:for-each>
+          </table>
+        </xsl:if>
+
+        <xsl:if test="/gjdoc:rootdoc/gjdoc:classdoc[gjdoc:containingPackage/@name=$gjdoc.outputfile.info][gjdoc:isError]">
+          <table border="1" cellspacing="0" width="100%" class="classdoc-table">
+            <tr><td colspan="2" class="section-header"><div class="section-header">Error Summary</div></td></tr>
+            <xsl:for-each select="/gjdoc:rootdoc/gjdoc:classdoc[gjdoc:containingPackage/@name=$gjdoc.outputfile.info][gjdoc:isError]">
+              <xsl:sort select="@name" order="ascending"/>
+              <xsl:call-template name="output-classes-summary"/>
+            </xsl:for-each>
+          </table>
+        </xsl:if>
+
+        <a name="description"><p> </p></a>
+        <h1 class="classdoc-sub-title package-description">Package <xsl:value-of select="$gjdoc.outputfile.info"/> Description</h1>
+
+        <div class="classdoc-package-comment-body">
+          <xsl:apply-templates select="/gjdoc:rootdoc/gjdoc:packagedoc[@name=$gjdoc.outputfile.info]/gjdoc:inlineTags/node()"/>
+        </div>
+
+      </div>
+
+        <!-- Bottom Navigation Bar -->
+        <xsl:call-template name="output_navbar">
+          <xsl:with-param name="p_show_package" select="0"/>
+          <xsl:with-param name="p_curr_package" select="1"/>
+          <xsl:with-param name="p_show_package_tree" select="1"/>
+          <xsl:with-param name="p_top" select="0"/> 
+        </xsl:call-template>
+      </body>
+    </html>
+
+  </xsl:template>
+
+  <xsl:template name="output-classes-summary">
+    <xsl:variable name="v_currentclass" select="@qualifiedtypename"/>
+    <xsl:variable name="v_sub_xml_filename" select="concat(@qualifiedtypename,'.xml')"/>
+    <tr>
+      <td class="class-link">
+        <a href="{concat(@name, '.html')}" class="package-link">
+          <xsl:value-of select="@name"/>
+        </a>
+      </td>
+      <td class="class-summary-description">
+        <xsl:variable name="v_docstring" select="document($v_sub_xml_filename,/gjdoc:rootdoc)/gjdoc:classdoc[@qualifiedtypename=$v_currentclass]/gjdoc:firstSentenceTags/node()"/>
+        <xsl:choose>
+          <xsl:when test="$v_docstring">
+            <xsl:for-each select="$v_docstring">
+              <xsl:value-of select="." disable-output-escaping="yes"/>
+            </xsl:for-each>
+          </xsl:when>
+          <xsl:otherwise>
+            <i>No description available.</i>
+          </xsl:otherwise>
+        </xsl:choose>
+      </td>
+    </tr>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/default_help_en.html b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/default_help_en.html
new file mode 100644
index 0000000..b59a63c
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/default_help_en.html
@@ -0,0 +1,7 @@
+  <body>
+    <h1 class="classdoc-title">Using the API Documentation</h1>
+
+    <p>
+      Write me.
+    </p>
+  </body>
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/gjdoc.js b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/gjdoc.js
new file mode 100644
index 0000000..125f8f6
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/gjdoc.js
@@ -0,0 +1,108 @@
+/* gjdoc.js
+ Copyright (C) 2004 Free Software Foundation, Inc.
+
+ This file is part of GNU Classpath.
+
+ GNU Classpath is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+ 
+ GNU Classpath is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNU Classpath; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+/**
+ *  Sets a new stylesheet for a single frame.
+ */
+function setStyleSheetForFrame(title, frame_name)
+{
+   var i, num, a, main;
+   f = eval("top.frames." + frame_name);
+   for(i=0; (a = f.document.getElementsByTagName("link")[i]); i++) {
+      if(a.getAttribute("rel").indexOf("style") != -1
+         && a.getAttribute("title")) {
+         a.disabled = true;
+         a.disabled = (a.getAttribute("title") != title);
+      }
+   }
+}
+
+/**
+ *  Sets a new stylesheet for a single document.
+ */
+function setStyleSheetForDocument(title) 
+{
+   var i, num, a, main;
+   for(i=0; (a = top.document.getElementsByTagName("link")[i]); i++) {
+      if(a.getAttribute("rel").indexOf("style") != -1
+         && a.getAttribute("title")) {
+         a.disabled = true;
+         a.disabled = (a.getAttribute("title") != title);        
+      }
+   }
+}
+
+/**
+ *  Sets a new stylesheets for all frames.
+ */
+function setStyleSheet(title)
+{
+   var i, num, a, main;
+   num = top.frames.length;
+   if (num > 0) {
+      for (i=0; i<num; i++) {
+         setStyleSheetForFrame(title, top.frames[i].name);
+      }
+   }
+   else {
+      setStyleSheetForDocument(title);
+   }
+   top.selectedSheet = title;
+   return false;
+}
+
+/**
+ *  Returns the title of the set of stylesheets that is active in the
+ *  given frame.
+ */
+function getActiveStylesheetTitle(frame)
+{ 
+   for(i=0; (a = frame.document.getElementsByTagName("link")[i]); i++) {
+      if(a.getAttribute("rel").indexOf("style") != -1
+         && a.getAttribute("title")) {
+         if (!a.disabled) {
+            return a.getAttribute("title");
+         }    
+      }
+   }
+   return "";
+}
+
+/**
+ *  Invoked when a page in the main content frame has been loaded.
+ */
+function contentPageLoaded(title) 
+{ 
+   top.document.title = title;
+   if (top.frames.length > 0) 
+      setStyleSheet(getActiveStylesheetTitle(top.frames.packages), "content");
+   else if (top.selectedSheet) { 
+      setStyleSheet(top.selectedSheet, "content");
+   }
+}
+
+/**
+ *  Invoked when a page in one of the two frames on the left hand has
+ *  been loaded.
+ */
+function secondaryPageLoaded(frame_name)
+{ 
+   setStyleSheet(getActiveStylesheetTitle(top.frames.packages), frame_name);
+}
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/gjdochtml-clean.css b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/gjdochtml-clean.css
new file mode 100644
index 0000000..0913e7d
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/gjdochtml-clean.css
@@ -0,0 +1,382 @@
+/* gjdochtml-clean.css
+ Copyright (C) 2004 Free Software Foundation, Inc.
+
+ This file is part of GNU Classpath.
+
+ GNU Classpath is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+ 
+ GNU Classpath is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNU Classpath; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+body.classdoc { 
+   background: white;
+   font-size: 100%;
+   margin: 0.5em 1em 0.5em 1em;
+}
+
+hr {
+   border-style: solid none none none;
+   border-width: thin;
+   height: 1px;
+   color: black;
+}
+
+hr.footer {
+   margin-top: 2em;
+}
+
+table,tr,td  {
+   border: solid 1px #aaaaaa !important;
+   border-collapse: collapse !important;
+}
+
+table.classdoc-table {
+   border-width: 1px;                    
+   border-collapse: collapse;
+}
+
+table.classdoc-table tr {
+   border-width: 1px;                    
+   border-collapse: collapse;
+}
+
+table.classdoc-table td {
+   border: solid 1px #aaaaaa;
+   border-collapse: collapse;
+}
+
+.header {
+
+   border-style: solid;
+   padding: 0.2em;
+   margin: 0.3em;
+}
+
+ul {
+   padding-top: 0em;
+   margin-top: 0em;
+}
+
+td {
+   padding: 0.3em;
+   vertical-align: top;
+}
+
+td.with-border {  
+   border-color: #aaaaaa;
+   border-style: solid;
+   border-top: 0px;
+}
+
+td.no-border-r { 
+   border-color: #aaaaaa;
+   border-style: solid;
+   border-right: 0px;
+   border-top: 0px;
+}
+
+td.no-border-b { 
+   border-color: #aaaaaa;
+   border-style: solid;
+   border-bottom: 0px;
+}
+
+td.no-border-rb { 
+   border-color: #aaaaaa;
+   border-style: solid;
+   border-right: 0px;
+   border-bottom: 0px;
+}
+
+.classdoc-head { 
+   border: 1px;
+   border-style: solid;
+   padding: 0.3em 0.7em 0.5em 0.7em;
+   margin: 0.0em;
+} 
+
+.classdoc-head-packagename { 
+   font-size: 110%;
+   padding: 0.0em;
+   margin: 0.0em;
+}
+
+.classdoc-head-classname { 
+   font-size: 180%;
+   padding: 0.0em;
+   margin: 0.0em;
+}
+
+h1.classdoc-header {
+   border-width: 1px;
+   border-style: solid;
+   font-size: 140%;
+   padding: 0.2em 0.5em 0.3em 0.5em;
+   margin-top: 0.0em;
+}
+
+h2.classdoc-header {
+   border-width: 1px;
+   border-style: solid;
+   font-size: 140%;
+   padding: 0.2em 0.5em 0.3em 0.5em;
+   margin-top: 0.0em;
+}
+
+h1.classdoc-header,
+h2.classdoc-header,
+.classdoc-head,
+.classdoc-subheader,
+.section-header,
+.sub-section-header {
+   background: #80B9FF;
+   font-weight: bolder;
+}
+
+table.navbar {
+  background: #BFDCFF;
+}
+
+div[class="navbar top"] {
+  margin-bottom: 1em;
+}
+
+span[class="navi-button current"] {
+  color: white;
+  background: #0055BA;
+}
+
+span[class="navi-button unavailable"] {
+  color: #888888;
+}
+
+h3.classdoc-header {
+   font-size: 110%;
+}
+
+.classdoc-subheader {
+   border-width: 1px;
+   border-style: solid;
+   font-size: 120%;
+   padding: 1.0em;
+}
+
+.classdoc-prototype { 
+}
+
+.classdoc-summary-comment {
+   margin-top: 1.0em;
+   margin-bottom: 1.0em;
+   font-size: 100%;
+}
+
+.classdoc-tree-label {
+   font-size: 80%;
+   line-height: 2.0em;
+   padding: 0%;
+   vertical-align: top;
+   height: 2.0em;
+   margin: 0%;                  
+   padding-left: 1.0em;
+}
+
+.classdoc-comment-body { 
+   font-size: 100%;
+}
+
+blockquote.classdoc-summary-comment {
+   margin: 0.4em 0.0em 0.2em 2.0em;
+   padding: 0em;
+}
+
+div.classdoc-comment-body {
+   margin: 0.4em 0.0em 0.2em 2.0em;
+   padding: 0em;
+}
+
+div.classdoc-package-comment-body {
+   margin: 0.4em 0.0em 1.5em 0.0em;
+   padding: 0em;
+}
+
+div.classdoc-class-comment-body {
+   margin: 0.8em 0.0em 1.0em 0.0em;
+   padding: 0.0em;
+}
+
+ul.classdoc-list {
+   margin-top: 0.2em;
+   margin-left: 1.6em;
+}
+
+div.classdoc-tag-section-header {
+   margin-top: 0.5em;
+   font-weight: bold;
+}
+
+ol.classdoc-list {
+   margin-top: 0.2em;
+   margin-left: 1.6em;
+   list-style-type: circle;
+}
+
+dl.classdoc-list {
+   margin-top: 0.2em;
+   margin-left: 1.6em;
+}
+
+.navi-button {
+  padding: 0.0em;
+  margin: 0.0em;
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+
+.header {
+   width: 100%;
+   padding: 0.0em 0.7em 0.5em 0.0em;
+   margin: 0.0em 0.0em 0.9em 0.0em;
+   border: black 1px;
+   border-style: none none solid none;
+}
+
+.navbar-first-row {
+   width: 100%;
+   padding: 0.0em 0.7em 0.0em 0.0em;
+   margin: 0.0em 0.0em 0.4em 0.0em;
+   font-size: 80%;
+}
+
+.navbar-second-row {
+   width: 100%;
+   padding: 0.0em 0.7em 0.0em 0.0em;
+   margin: 0.0em 0.0em 0.0em 0.0em;
+   font-size: 70%;
+}
+
+.prototype {
+   text-indent:-2em; 
+   font-family:monospace; 
+   padding: 0em 0em 0em 2em;
+   margin: 0em; 
+}
+
+.prototype-type {
+   font-family:monospace; 
+   padding: 0em;
+   margin: 0em; 
+}
+
+.prototype-name {
+   font-family:monospace; 
+}
+
+span.parameter {
+   padding: 0em;
+   margin: 0em;
+   white-space: nowrap;
+}
+
+div.footer {
+   margin-bottom: 6cm;
+   font-style: italic;
+   font-size: 0.8em;
+}
+
+pre {
+   margin-left: 1.6em;
+}
+
+pre.inheritance-tree {
+   margin-left: 0.0em;
+}
+
+a.tree-class-link {
+   font-weight: bold;
+}
+
+span.index-category-current {
+  padding: 0.4em;
+  border: 1px black solid;
+}
+
+a.index-category-link {
+  padding: 0.4em;
+}
+
+a.menu {
+  font-size: 90%;
+}
+
+table.navbar {
+  width: 100%;
+  margin: 0px;
+  border: solid 1px #888888;
+  padding: 0px;
+}
+
+tr.navbar, td.navbar {
+  padding: 0.3em;
+  margin: 0px;
+}
+
+
+h1.overview-doctitle {
+  font-size: 170%;
+  text-align: center;
+  padding-bottom: 0.5em;
+}
+
+div.overview-description-top,
+div.overview-description-full {
+  margin-top: 1.5em;
+}
+
+table {
+  margin-top: 0em;
+  margin-bottom: 1em;
+  border-collapse: collapse;
+}
+
+span.navsep {
+}
+
+a[href] {
+  color: #0055BA;
+}
+
+a:visited {
+  color: #003B82;
+}
+
+a:active {
+  color: #80B9FF;
+}
+
+blockquote.member-summary {
+   text-indent: 2em;
+   margin: 0em;
+   margin-top: 0.2em;
+}
+
+table {
+   width: 100%;
+}
+
+td[class="member-summary method modifiers"] {
+  text-align: right;
+}
+
+td[class="member-summary field modifiers"] {
+  text-align: right;
+}
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/gjdochtml-fixed.css b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/gjdochtml-fixed.css
new file mode 100644
index 0000000..0c96c00
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/gjdochtml-fixed.css
@@ -0,0 +1,286 @@
+/* gjdochtml-fixed.css
+ Copyright (C) 2004 Free Software Foundation, Inc.
+
+ This file is part of GNU Classpath.
+
+ GNU Classpath is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+ 
+ GNU Classpath is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNU Classpath; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+table  {
+   border: none !important;
+   border-top: none !important;
+   border-left: none !important;
+   border-right: none !important;
+   border-bottom: none !important;
+}
+
+td {
+   border: none !important;
+   border-top: none !important;
+   border-left: none !important;
+   border-right: none !important;
+   border-bottom: none !important;
+}
+
+body.classdoc { 
+   font-size: 100%;
+   margin: 0em;
+   padding: 0em;
+}
+
+table.navbar {
+   margin: 0em;
+   position: fixed;
+   z-index: 20;
+   left: 0em;
+   top: 0em;
+   width: 100%;
+   background: #0066B3;
+   color: white;
+   padding: 0.3em;
+   border-bottom: 3px solid black !important;
+   height: 5.3em;
+}
+
+table[class="navbar bottom"] {
+   visibility: hidden;
+}
+
+a.navi-button {
+   color: #FFB200;
+}
+
+.navbar-first-row {
+   font-size: 80%;
+   padding-bottom: 0.3em;
+}
+
+.navbar-second-row {
+   font-size: 70%;
+   text-align: right;
+   padding-right: 4.5em;
+}
+
+
+div.pagebody {
+  margin-top: 7em;
+  padding-left: 1em;
+  padding-right: 1em;
+  padding-bottom: 5em;
+  z-index: -100;
+}
+
+span.navsep:before {
+  padding-left: 0.25em;
+  content: "|";
+}
+
+span[class="navi-button current"] {
+  background: #003D6B;
+  color: white;
+}
+
+span[class="navi-button unavailable"] {
+  color: white;
+}
+
+.navi-button {
+  padding-left: 0.1em;                       
+  padding-right: 0.1em;                       
+
+}
+
+
+.classdoc-table-xxx { 
+   border-color: #aaaaaa;
+   border-style: solid;
+   border-collapse: collapse;
+}
+
+.classdoc-table { 
+   border: 0px;
+   border-collapse: collapse;
+}
+
+td {
+   vertical-align: top;
+   padding: 0.2em;
+}
+
+table {
+   margin-top: 1em;
+}
+
+span.index-category-current {
+  padding: 0.4em;
+  border: 1px black solid;
+}
+
+a.index-category-link {
+  width: 5em;
+  min-width: 5em;
+  padding: 0.3em;
+  margin-right: 0.4em;
+  color: #FFB200;
+  border: 1px #FFB200 solid;
+  text-decoration: none;
+}
+
+a[href] {
+  color: #991F00;
+}
+
+.classdoc-subtitle {
+  position: fixed;
+  left: 0.0em;
+  top: 2.7em;
+  font-size: 80%;
+  font-weight: bold;
+  color: #FFD980;
+  z-index: 30;
+  padding-left: 1.0em;
+  padding-top: 0.0em;
+  margin-top: 0.0em;
+}
+
+h1.classdoc-title {
+  position: fixed;
+  left: 0.0em;
+  top: 2.4em;
+  font-size: 130%;      
+  z-index: 30;
+  color: #FFD980;
+  padding-left: 0.5em;
+  padding-top: 0.0em;
+  margin-top: 0.0em;    
+}
+
+div.index-categories {
+  position: fixed;
+  left: 28em;
+  top: 5.8em;
+  font-size: 60%;
+  padding-top: 0.0em;
+  margin-top: 0.0em;
+}
+
+.before-details {
+}
+
+h3.menu-title {
+  width: 100%;
+  position: fixed;
+  left: 0em;
+  top: 0em;
+  margin-top: 0em;
+  background: #0066B3;
+  color: #FFD980;
+  padding: 0.3em;
+  padding-left: 0.8em;
+  border-bottom: 3px solid black;
+  font-size: 100%;
+}
+
+h3.menu-title > a {
+  color: #FFB200;
+}
+
+body.menu {
+  padding-top: 2em;
+}
+
+a.menu {
+  font-size: 85%;
+}
+
+a.classdoc {
+  position: relative;
+  top: -6em;
+}
+
+
+div.section-header, h1.classdoc-header {
+   background: #FFD980;
+   margin-bottom: 0px;
+   font-size: 130%;
+   font-weight: bolder;
+   padding-left: 2px;
+   margin-top: 1em;
+   padding-top: 4px;
+   padding-bottom: 4px;
+   position: relative;
+   left: -200px;
+   padding-left: 202px;
+   padding-right: 20px;
+   border: 1px solid black;
+   width: 60%;
+}
+
+div.sub-section-header {
+   background: #FFD980;
+   margin-bottom: 0px;
+   font-size: 110%;
+   font-weight: normal;
+   padding-left: 2px;
+   margin-top: 1em;
+   padding-top: 4px;
+   padding-bottom: 4px;
+   position: relative;
+   left: -200px;
+   padding-left: 202px;
+   padding-right: 20px;
+   border: 1px solid black;
+   width: 60%;
+}
+
+table {
+   width: 100%;
+}
+
+dl.classdoc-list {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  margin-left: 2.5em;
+}
+
+blockquote.member-summary {
+   margin: 0px;
+   font-style: oblique;
+   font-size: 90%;
+   margin-top: 0.1em;
+   margin-bottom: 0.2em;
+   margin-left: 1em;
+}
+
+td[class="member-summary method modifiers"] {
+  text-align: right;
+}
+
+div.classdoc-tag-section-header {
+   margin-top: 0.5em;
+   font-weight: bold;
+}
+
+div.navbar-style-selector {
+  position: fixed;
+  right: 1em;
+  top: 2.9em;
+  z-index: 50;
+  padding-right: 0.6em;
+  vertical-align: top;
+}
+
+/* triad @ 225 deg */
+
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/gjdochtml-sclara.css b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/gjdochtml-sclara.css
new file mode 100644
index 0000000..5c7f119
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/gjdochtml-sclara.css
@@ -0,0 +1,266 @@
+/* gjdochtml-sclara.css
+ Copyright (C) 2004 Free Software Foundation, Inc.
+
+ This file is part of GNU Classpath.
+
+ GNU Classpath is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+ 
+ GNU Classpath is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNU Classpath; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+div.section-header,
+h1.classdoc-header {
+   background: #ccccff;
+   border: black ridge 2px;
+   border-collapse: collapse;
+   vertical-align: inherit;
+   text-align: inherit; 
+   margin-bottom: 0px;
+   font-size: 155%;
+   font-weight: bold;
+   padding-left: 2px;
+   margin-top: 1em;
+   padding-top: 2px;
+   padding-bottom: 2px;
+}
+
+td.section-header {
+   background: #ccccff;
+   margin-bottom: 0px;
+   font-size: 155%;
+   font-weight: bold;
+   padding-left: 2px;
+   margin-top: 1em;
+   padding-top: 2px;
+   padding-bottom: 2px;
+}
+
+td.sub-section-header {
+   background: #eeeeff;
+   margin-bottom: 0px;
+   font-size: 110%;
+   font-weight: normal;
+   padding-left: 2px;
+   margin-top: 1em;
+   padding-top: 2px;
+   padding-bottom: 2px;
+}
+
+table.classdoc-table {
+   margin-top: 1.5em;
+}
+
+div.navbar-first-row {
+   background: #eeeeff;
+   padding-top: 4px;
+   padding-bottom: 4px;
+   padding-left: 4px;
+   padding-right: 4px;
+   font-size: 100%;
+   color: black;
+   font-family: Arial, sans-serif;
+   font-weight: normal;
+}
+
+div.navbar-second-row {
+   padding-top: 0px;
+   padding-bottom: 9px;
+}
+
+div.navbar-second-row a[href] {
+   text-decoration: underline;
+   font-family: Arial, sans-serif;
+   font-weight: normal;
+   font-size: 60%;
+   text-transform: uppercase;
+   padding-top: 0px;
+   margin-top: 0px;
+   background: white;
+   margin-left: 8px;
+}
+
+div.navbar-second-row span {
+   padding: 0px;
+   margin: 0px;
+}
+
+span.navi-button {
+   padding-left: 0.4em;
+   padding-right: 0.4em;
+}
+
+div.navbar-first-row span[class="navi-button current"] {
+  background: #00008B;
+  color: white;
+  font-weight: bold;
+}
+
+div.navbar-first-row span[class="navi-button unavailable"] {
+  font-weight: normal;
+}
+
+div.navbar-first-row a[href] {
+   padding-bottom: 0px;
+   font-weight: lighter;
+   text-decoration: none;
+   border-bottom: 1px solid blue;
+   position: relative;
+   top: -1px;
+}
+
+div.navbar-first-row a:visited {
+   color: black;
+   font-weight: lighter;
+   text-decoration: none;
+   border-bottom: 1px solid black;
+}
+
+div.navbar-first-row span.navi-link {
+   padding: 0px;
+   margin: 0px;
+   color: black;
+   font-weight: bold;
+   position: relative;
+   top: 1px;
+}
+
+span.navsep {
+  padding-left: 0.15em;
+}
+
+a.menu {
+  font-family: Arial, Sans-Serif;
+  font-size: 90%;
+}
+
+table.navbar[class="navbar top"] {
+  padding-bottom: 4px;
+  border-bottom: inset 1px black;
+}
+
+table {
+  width: 100%;
+  margin: 0px;
+  border: none;
+  padding: 0px;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+tr.navbar {
+  margin: 0px;
+  padding: 0px;
+  border: none;
+}
+
+td.navbar {
+  margin: 0px;
+  padding: 0px;
+  border: none;
+}
+
+a.package-link,
+a.class-link {
+  font-weight: bold;
+}
+
+table,tr,td {
+}
+
+table.classdoc-table {
+}
+
+table.classdoc-table tr {
+}
+
+table.classdoc-table td {
+   border: ridge 2px black;
+   border-collapse: separate;
+}
+
+td {
+   padding: 2px;
+}
+
+h1.classdoc-title,
+h1.classdoc-sub-title {
+   font-size: 150%;
+   font-weight: bold;
+}
+
+div.pagebody {
+   padding-bottom: 1em;
+}
+
+h3.menu-title {
+   font-family: Arial, Sans-Serif;
+   font-weight: normal;
+   font-size: 105%;
+}
+
+p.member-summary {
+   margin: 0px;
+   padding: 0px;
+   font-family: Monospace;
+}
+
+p.modifiers {
+   font-size: 80%;
+}
+
+a.name {
+   font-weight: bold;
+}
+
+blockquote.member-summary {
+   text-indent: 3em;
+   margin: 0px;
+}
+
+td.member-summary {
+   vertical-align: top;
+}
+
+.classdoc-head-packagename {
+   font-weight: bold;
+   padding-top: 2em;
+   padding-bottom: 0em;
+   margin: 0em;
+}
+
+.classdoc-head-classname {
+   padding-top: 0em;
+   margin-top: 0em;
+}
+
+td.super {
+   font-family: Monospace;
+}
+
+.classdoc-tag-section-header {
+  font-weight: bold;
+}
+
+dl.classdoc-list {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  margin-left: 2.5em;
+}
+
+div.section-header,
+div.sub-section-header {
+  border: none;
+  padding: 0px;
+  margin: 0px;
+  font-size: inherit;
+}
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/gjdochtml.css b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/gjdochtml.css
new file mode 100644
index 0000000..5944c6c
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/gjdochtml.css
@@ -0,0 +1,29 @@
+/* gjdochtml.css
+ Copyright (C) 2004 Free Software Foundation, Inc.
+
+ This file is part of GNU Classpath.
+
+ GNU Classpath is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+ 
+ GNU Classpath is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNU Classpath; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+body { 
+   background: white;
+   font-size: 100%;
+}
+
+ol.tree,
+li.tree {
+   list-style-type: disc;
+}
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/dbcentx.mod b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/dbcentx.mod
new file mode 100644
index 0000000..144d38d
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/dbcentx.mod
@@ -0,0 +1,204 @@
+<!-- ...................................................................... -->
+<!-- DocBook XML character entities module V4.1.2 ........................... -->
+<!-- File dbcentx.mod ..................................................... -->
+
+<!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
+     O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
+     Corporation, Norman Walsh, and the Organization for the Advancement
+     of Structured Information Standards (OASIS).
+
+     $Id: dbcentx.mod,v 1.1 2008/05/27 19:26:05 jsumali Exp $
+
+     Permission to use, copy, modify and distribute the DocBook XML DTD
+     and its accompanying documentation for any purpose and without fee
+     is hereby granted in perpetuity, provided that the above copyright
+     notice and this paragraph appear in all copies.  The copyright
+     holders make no representation about the suitability of the DTD for
+     any purpose.  It is provided "as is" without expressed or implied
+     warranty.
+
+     If you modify the DocBook XML DTD in any way, except for declaring and
+     referencing additional sets of general entities and declaring
+     additional notations, label your DTD as a variant of DocBook.  See
+     the maintenance documentation for more information.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+-->
+
+<!-- ...................................................................... -->
+
+<!-- This module contains the entity declarations for the standard ISO
+     entity sets used by DocBook.
+
+     In DTD driver files referring to this module, please use an entity
+     declaration that uses the public identifier shown below:
+
+     <!ENTITY % dbcent PUBLIC
+     "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN"
+     "dbcentx.mod">
+     %dbcent;
+
+     See the documentation for detailed information on the parameter
+     entity and module scheme used in DocBook, customizing DocBook and
+     planning for interchange, and changes made since the last release
+     of DocBook.
+-->
+
+<!-- ...................................................................... -->
+
+<!ENTITY % ISOamsa.module "INCLUDE">
+<![%ISOamsa.module;[
+<!ENTITY % ISOamsa PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
+"ent/iso-amsa.ent">
+%ISOamsa;
+<!--end of ISOamsa.module-->]]>
+
+<!ENTITY % ISOamsb.module "INCLUDE">
+<![%ISOamsb.module;[
+<!ENTITY % ISOamsb PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
+"ent/iso-amsb.ent">
+%ISOamsb;
+<!--end of ISOamsb.module-->]]>
+
+<!ENTITY % ISOamsc.module "INCLUDE">
+<![%ISOamsc.module;[
+<!ENTITY % ISOamsc PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
+"ent/iso-amsc.ent">
+%ISOamsc;
+<!--end of ISOamsc.module-->]]>
+
+<!ENTITY % ISOamsn.module "INCLUDE">
+<![%ISOamsn.module;[
+<!ENTITY % ISOamsn PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
+"ent/iso-amsn.ent">
+%ISOamsn;
+<!--end of ISOamsn.module-->]]>
+
+<!ENTITY % ISOamso.module "INCLUDE">
+<![%ISOamso.module;[
+<!ENTITY % ISOamso PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
+"ent/iso-amso.ent">
+%ISOamso;
+<!--end of ISOamso.module-->]]>
+
+<!ENTITY % ISOamsr.module "INCLUDE">
+<![%ISOamsr.module;[
+<!ENTITY % ISOamsr PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
+"ent/iso-amsr.ent">
+%ISOamsr;
+<!--end of ISOamsr.module-->]]>
+
+<!ENTITY % ISObox.module "INCLUDE">
+<![%ISObox.module;[
+<!ENTITY % ISObox PUBLIC
+"ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
+"ent/iso-box.ent">
+%ISObox;
+<!--end of ISObox.module-->]]>
+
+<!ENTITY % ISOcyr1.module "INCLUDE">
+<![%ISOcyr1.module;[
+<!ENTITY % ISOcyr1 PUBLIC
+"ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
+"ent/iso-cyr1.ent">
+%ISOcyr1;
+<!--end of ISOcyr1.module-->]]>
+
+<!ENTITY % ISOcyr2.module "INCLUDE">
+<![%ISOcyr2.module;[
+<!ENTITY % ISOcyr2 PUBLIC
+"ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
+"ent/iso-cyr2.ent">
+%ISOcyr2;
+<!--end of ISOcyr2.module-->]]>
+
+<!ENTITY % ISOdia.module "INCLUDE">
+<![%ISOdia.module;[
+<!ENTITY % ISOdia PUBLIC
+"ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
+"ent/iso-dia.ent">
+%ISOdia;
+<!--end of ISOdia.module-->]]>
+
+<!ENTITY % ISOgrk1.module "INCLUDE">
+<![%ISOgrk1.module;[
+<!ENTITY % ISOgrk1 PUBLIC
+"ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
+"ent/iso-grk1.ent">
+%ISOgrk1;
+<!--end of ISOgrk1.module-->]]>
+
+<!ENTITY % ISOgrk2.module "INCLUDE">
+<![%ISOgrk2.module;[
+<!ENTITY % ISOgrk2 PUBLIC
+"ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
+"ent/iso-grk2.ent">
+%ISOgrk2;
+<!--end of ISOgrk2.module-->]]>
+
+<!ENTITY % ISOgrk3.module "INCLUDE">
+<![%ISOgrk3.module;[
+<!ENTITY % ISOgrk3 PUBLIC
+"ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
+"ent/iso-grk3.ent">
+%ISOgrk3;
+<!--end of ISOgrk3.module-->]]>
+
+<!ENTITY % ISOgrk4.module "INCLUDE">
+<![%ISOgrk4.module;[
+<!ENTITY % ISOgrk4 PUBLIC
+"ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
+"ent/iso-grk4.ent">
+%ISOgrk4;
+<!--end of ISOgrk4.module-->]]>
+
+<!ENTITY % ISOlat1.module "INCLUDE">
+<![%ISOlat1.module;[
+<!ENTITY % ISOlat1 PUBLIC
+"ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+"ent/iso-lat1.ent">
+%ISOlat1;
+<!--end of ISOlat1.module-->]]>
+
+<!ENTITY % ISOlat2.module "INCLUDE">
+<![%ISOlat2.module;[
+<!ENTITY % ISOlat2 PUBLIC
+"ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
+"ent/iso-lat2.ent">
+%ISOlat2;
+<!--end of ISOlat2.module-->]]>
+
+<!ENTITY % ISOnum.module "INCLUDE">
+<![%ISOnum.module;[
+<!ENTITY % ISOnum PUBLIC
+"ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+"ent/iso-num.ent">
+%ISOnum;
+<!--end of ISOnum.module-->]]>
+
+<!ENTITY % ISOpub.module "INCLUDE">
+<![%ISOpub.module;[
+<!ENTITY % ISOpub PUBLIC
+"ISO 8879:1986//ENTITIES Publishing//EN//XML"
+"ent/iso-pub.ent">
+%ISOpub;
+<!--end of ISOpub.module-->]]>
+
+<!ENTITY % ISOtech.module "INCLUDE">
+<![%ISOtech.module;[
+<!ENTITY % ISOtech PUBLIC
+"ISO 8879:1986//ENTITIES General Technical//EN//XML"
+"ent/iso-tech.ent">
+%ISOtech;
+<!--end of ISOtech.module-->]]>
+
+<!-- End of DocBook XML character entity sets module V4.1.2 ................. -->
+<!-- ...................................................................... -->
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsa.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsa.ent
new file mode 100644
index 0000000..c03b1c9
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsa.ent
@@ -0,0 +1,98 @@
+<!-- ...................................................................... -->
+<!-- ISO Added Math Symbols: Arrow Relations Entities V0.3 ................ -->
+<!-- File iso-amsa.ent .................................................... -->
+
+<!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
+     Information Standards (OASIS).
+
+     $Id: iso-amsa.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $
+
+     Permission to use, copy, modify and distribute this entity set
+     and its accompanying documentation for any purpose and without
+     fee is hereby granted in perpetuity, provided that the above
+     copyright notice and this paragraph appear in all copies. The
+     copyright holders make no representation about the suitability of
+     the entities for any purpose. It is provided "as is" without
+     expressed or implied warranty.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+
+     Derived, in part, from:
+
+       * iso-amsa.gml
+
+           Copyright (C) 1986 International Organization for Standardization
+           Permission to copy in any form is granted for use with
+           conforming SGML systems and applications as defined in
+           ISO 8879, provided this notice is included in all copies.
+
+       * http://www.tug.org/applications/jadetex/unicode.xml
+
+       * ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT
+
+     Please use the following formal public identifier to identify it:
+
+       ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML
+-->
+
+<!ENTITY cularr	"&#x21B6;"> <!-- ANTICLOCKWISE TOP SEMICIRCLE ARROW -->
+<!ENTITY curarr	"&#x21B7;"> <!-- CLOCKWISE TOP SEMICIRCLE ARROW -->
+<!ENTITY dArr	"&#x21D3;"> <!-- DOWNWARDS DOUBLE ARROW -->
+<!ENTITY darr2	"&#x21CA;"> <!-- DOWNWARDS PAIRED ARROWS -->
+<!ENTITY dharl	"&#x21C3;"> <!-- DOWNWARDS HARPOON WITH BARB LEFTWARDS -->
+<!ENTITY dharr	"&#x21C2;"> <!-- DOWNWARDS HARPOON WITH BARB RIGHTWARDS -->
+<!ENTITY lAarr	"&#x21DA;"> <!-- LEFTWARDS TRIPLE ARROW -->
+<!ENTITY Larr	"&#x219E;"> <!-- LEFTWARDS TWO HEADED ARROW -->
+<!ENTITY larr2	"&#x21C7;"> <!-- LEFTWARDS PAIRED ARROWS -->
+<!ENTITY larrhk	"&#x21A9;"> <!-- LEFTWARDS ARROW WITH HOOK -->
+<!ENTITY larrlp	"&#x21AB;"> <!-- LEFTWARDS ARROW WITH LOOP -->
+<!ENTITY larrtl	"&#x21A2;"> <!-- LEFTWARDS ARROW WITH TAIL -->
+<!ENTITY lhard	"&#x21BD;"> <!-- LEFTWARDS HARPOON WITH BARB DOWNWARDS -->
+<!ENTITY lharu	"&#x21BC;"> <!-- LEFTWARDS HARPOON WITH BARB UPWARDS -->
+<!ENTITY hArr	"&#x21D4;"> <!--  -->
+<!ENTITY harr	"&#x2194;"> <!-- LEFT RIGHT ARROW -->
+<!ENTITY lrarr2	"&#x21C6;"> <!-- LEFTWARDS ARROW OVER RIGHTWARDS ARROW -->
+<!ENTITY rlarr2	"&#x21C4;"> <!-- RIGHTWARDS ARROW OVER LEFTWARDS ARROW -->
+<!ENTITY harrw	"&#x21AD;"> <!-- LEFT RIGHT WAVE ARROW -->
+<!ENTITY rlhar2	"&#x21CC;"> <!-- RIGHTWARDS HARPOON OVER LEFTWARDS HARPOON -->
+<!ENTITY lrhar2	"&#x21CB;"> <!-- LEFTWARDS HARPOON OVER RIGHTWARDS HARPOON -->
+<!ENTITY lsh	"&#x21B0;"> <!-- UPWARDS ARROW WITH TIP LEFTWARDS -->
+<!ENTITY map	"&#x21A6;"> <!-- RIGHTWARDS ARROW FROM BAR -->
+<!ENTITY mumap	"&#x22B8;"> <!-- MULTIMAP -->
+<!ENTITY nearr	"&#x2197;"> <!-- NORTH EAST ARROW -->
+<!ENTITY nlArr	"&#x21CD;"> <!-- LEFTWARDS DOUBLE ARROW WITH STROKE -->
+<!ENTITY nlarr	"&#x219A;"> <!-- LEFTWARDS ARROW WITH STROKE -->
+<!ENTITY nhArr	"&#x21CE;"> <!-- LEFT RIGHT DOUBLE ARROW WITH STROKE -->
+<!ENTITY nharr	"&#x21AE;"> <!-- LEFT RIGHT ARROW WITH STROKE -->
+<!ENTITY nrarr	"&#x219B;"> <!-- RIGHTWARDS ARROW WITH STROKE -->
+<!ENTITY nrArr	"&#x21CF;"> <!-- RIGHTWARDS DOUBLE ARROW WITH STROKE -->
+<!ENTITY nwarr	"&#x2196;"> <!-- NORTH WEST ARROW -->
+<!ENTITY olarr	"&#x21BA;"> <!-- ANTICLOCKWISE OPEN CIRCLE ARROW -->
+<!ENTITY orarr	"&#x21BB;"> <!-- CLOCKWISE OPEN CIRCLE ARROW -->
+<!ENTITY rAarr	"&#x21DB;"> <!-- RIGHTWARDS TRIPLE ARROW -->
+<!ENTITY Rarr	"&#x21A0;"> <!-- RIGHTWARDS TWO HEADED ARROW -->
+<!ENTITY rarr2	"&#x21C9;"> <!-- RIGHTWARDS PAIRED ARROWS -->
+<!ENTITY rarrhk	"&#x21AA;"> <!-- RIGHTWARDS ARROW WITH HOOK -->
+<!ENTITY rarrlp	"&#x21AC;"> <!-- RIGHTWARDS ARROW WITH LOOP -->
+<!ENTITY rarrtl	"&#x21A3;"> <!-- RIGHTWARDS ARROW WITH TAIL -->
+<!ENTITY rarrw	"&#x219D;"> <!-- RIGHTWARDS SQUIGGLE ARROW -->
+<!ENTITY rhard	"&#x21C1;"> <!-- RIGHTWARDS HARPOON WITH BARB DOWNWARDS -->
+<!ENTITY rharu	"&#x21C0;"> <!-- RIGHTWARDS HARPOON WITH BARB UPWARDS -->
+<!ENTITY rsh	"&#x21B1;"> <!-- UPWARDS ARROW WITH TIP RIGHTWARDS -->
+<!ENTITY drarr	"&#x2198;"> <!-- SOUTH EAST ARROW -->
+<!ENTITY dlarr	"&#x2199;"> <!-- SOUTH WEST ARROW -->
+<!ENTITY uArr	"&#x21D1;"> <!-- UPWARDS DOUBLE ARROW -->
+<!ENTITY uarr2	"&#x21C8;"> <!-- UPWARDS PAIRED ARROWS -->
+<!ENTITY vArr	"&#x21D5;"> <!-- UP DOWN DOUBLE ARROW -->
+<!ENTITY varr	"&#x2195;"> <!-- UP DOWN ARROW -->
+<!ENTITY uharl	"&#x21BF;"> <!-- UPWARDS HARPOON WITH BARB LEFTWARDS -->
+<!ENTITY uharr	"&#x21BE;"> <!-- UPWARDS HARPOON WITH BARB RIGHTWARDS -->
+<!ENTITY xlArr	"&#x21D0;"> <!-- LEFTWARDS DOUBLE ARROW -->
+<!ENTITY xhArr	"&#x2194;"> <!-- LEFT RIGHT ARROW -->
+<!ENTITY xharr	"&#x2194;"> <!-- LEFT RIGHT ARROW -->
+<!ENTITY xrArr	"&#x21D2;"> <!-- RIGHTWARDS DOUBLE ARROW -->
+
+<!-- End of Added Math Symbols: Arrow Relations Entities V0.3 ............. -->
+<!-- ...................................................................... -->
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsb.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsb.ent
new file mode 100644
index 0000000..945d7ee
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsb.ent
@@ -0,0 +1,84 @@
+<!-- ...................................................................... -->
+<!-- ISO Added Math Symbols: Binary Operators Entities V0.3 ............... -->
+<!-- File iso-amsb.ent .................................................... -->
+
+<!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
+     Information Standards (OASIS).
+
+     $Id: iso-amsb.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $
+
+     Permission to use, copy, modify and distribute this entity set
+     and its accompanying documentation for any purpose and without
+     fee is hereby granted in perpetuity, provided that the above
+     copyright notice and this paragraph appear in all copies. The
+     copyright holders make no representation about the suitability of
+     the entities for any purpose. It is provided "as is" without
+     expressed or implied warranty.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+
+     Derived, in part, from:
+
+       * iso-amsb.gml
+
+           Copyright (C) 1986 International Organization for Standardization
+           Permission to copy in any form is granted for use with
+           conforming SGML systems and applications as defined in
+           ISO 8879, provided this notice is included in all copies.
+
+       * http://www.tug.org/applications/jadetex/unicode.xml
+
+       * ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT
+
+     Please use the following formal public identifier to identify it:
+
+       ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML
+-->
+
+<!ENTITY amalg	"&#x2210;"> <!-- N-ARY COPRODUCT -->
+<!ENTITY Barwed	"&#x2306;"> <!-- PERSPECTIVE -->
+<!ENTITY barwed	"&#x22BC;"> <!-- NAND -->
+<!ENTITY Cap	"&#x22D2;"> <!-- DOUBLE INTERSECTION -->
+<!ENTITY Cup	"&#x22D3;"> <!-- DOUBLE UNION -->
+<!ENTITY cuvee	"&#x22CE;"> <!-- CURLY LOGICAL OR -->
+<!ENTITY cuwed	"&#x22CF;"> <!-- CURLY LOGICAL AND -->
+<!ENTITY diam	"&#x22C4;"> <!-- DIAMOND OPERATOR -->
+<!ENTITY divonx	"&#x22C7;"> <!-- DIVISION TIMES -->
+<!ENTITY intcal	"&#x22BA;"> <!-- INTERCALATE -->
+<!ENTITY lthree	"&#x22CB;"> <!-- LEFT SEMIDIRECT PRODUCT -->
+<!ENTITY ltimes	"&#x22C9;"> <!-- LEFT NORMAL FACTOR SEMIDIRECT PRODUCT -->
+<!ENTITY minusb	"&#x229F;"> <!-- SQUARED MINUS -->
+<!ENTITY oast	"&#x229B;"> <!-- CIRCLED ASTERISK OPERATOR -->
+<!ENTITY ocir	"&#x229A;"> <!-- CIRCLED RING OPERATOR -->
+<!ENTITY odash	"&#x229D;"> <!-- CIRCLED DASH -->
+<!ENTITY odot	"&#x2299;"> <!-- CIRCLED DOT OPERATOR -->
+<!ENTITY ominus	"&#x2296;"> <!-- CIRCLED MINUS -->
+<!ENTITY oplus	"&#x2295;"> <!-- CIRCLED PLUS -->
+<!ENTITY osol	"&#x2298;"> <!-- CIRCLED DIVISION SLASH -->
+<!ENTITY otimes	"&#x2297;"> <!-- CIRCLED TIMES -->
+<!ENTITY plusb	"&#x229E;"> <!-- SQUARED PLUS -->
+<!ENTITY plusdo	"&#x2214;"> <!-- DOT PLUS -->
+<!ENTITY rthree	"&#x22CC;"> <!-- RIGHT SEMIDIRECT PRODUCT -->
+<!ENTITY rtimes	"&#x22CA;"> <!-- RIGHT NORMAL FACTOR SEMIDIRECT PRODUCT -->
+<!ENTITY sdot	"&#x22C5;"> <!-- DOT OPERATOR -->
+<!ENTITY sdotb	"&#x22A1;"> <!-- SQUARED DOT OPERATOR -->
+<!ENTITY setmn	"&#x2216;"> <!-- SET MINUS -->
+<!ENTITY sqcap	"&#x2293;"> <!-- SQUARE CAP -->
+<!ENTITY sqcup	"&#x2294;"> <!-- SQUARE CUP -->
+<!ENTITY ssetmn	"&#x2216;"> <!-- SET MINUS -->
+<!ENTITY sstarf	"&#x22C6;"> <!-- STAR OPERATOR -->
+<!ENTITY timesb	"&#x22A0;"> <!-- SQUARED TIMES -->
+<!ENTITY top	"&#x22A4;"> <!-- DOWN TACK -->
+<!ENTITY uplus	"&#x228E;"> <!-- MULTISET UNION -->
+<!ENTITY wreath	"&#x2240;"> <!-- WREATH PRODUCT -->
+<!ENTITY xcirc	"&#x25CB;"> <!-- WHITE CIRCLE -->
+<!ENTITY xdtri	"&#x25BD;"> <!-- WHITE DOWN-POINTING TRIANGLE -->
+<!ENTITY xutri	"&#x25B3;"> <!-- WHITE UP-POINTING TRIANGLE -->
+<!ENTITY coprod	"&#x2210;"> <!-- N-ARY COPRODUCT -->
+<!ENTITY prod	"&#x220F;"> <!-- N-ARY PRODUCT -->
+<!ENTITY sum	"&#x2211;"> <!-- N-ARY SUMMATION -->
+
+<!-- End of Added Math Symbols: Binary Operators Entities V0.3 ............ -->
+<!-- ...................................................................... -->
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsc.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsc.ent
new file mode 100644
index 0000000..604ac48
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsc.ent
@@ -0,0 +1,52 @@
+<!-- ...................................................................... -->
+<!-- ISO Added Math Symbols: Delimiters Entities V0.3 ..................... -->
+<!-- File iso-amsc.ent .................................................... -->
+
+<!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
+     Information Standards (OASIS).
+
+     $Id: iso-amsc.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $
+
+     Permission to use, copy, modify and distribute this entity set
+     and its accompanying documentation for any purpose and without
+     fee is hereby granted in perpetuity, provided that the above
+     copyright notice and this paragraph appear in all copies. The
+     copyright holders make no representation about the suitability of
+     the entities for any purpose. It is provided "as is" without
+     expressed or implied warranty.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+
+     Derived, in part, from:
+
+       * iso-amsc.gml
+
+           Copyright (C) 1986 International Organization for Standardization
+           Permission to copy in any form is granted for use with
+           conforming SGML systems and applications as defined in
+           ISO 8879, provided this notice is included in all copies.
+
+       * http://www.tug.org/applications/jadetex/unicode.xml
+
+       * ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT
+
+     Please use the following formal public identifier to identify it:
+
+       ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML
+-->
+
+<!ENTITY rceil	"&#x2309;"> <!-- RIGHT CEILING -->
+<!ENTITY rfloor	"&#x230B;"> <!-- RIGHT FLOOR -->
+<!ENTITY rpargt	"&#xE291;"> <!--  -->
+<!ENTITY urcorn	"&#x231D;"> <!-- TOP RIGHT CORNER -->
+<!ENTITY drcorn	"&#x231F;"> <!-- BOTTOM RIGHT CORNER -->
+<!ENTITY lceil	"&#x2308;"> <!-- LEFT CEILING -->
+<!ENTITY lfloor	"&#x230A;"> <!-- LEFT FLOOR -->
+<!--     lpargt	Unknown unicode character -->
+<!ENTITY ulcorn	"&#x231C;"> <!-- TOP LEFT CORNER -->
+<!ENTITY dlcorn	"&#x231E;"> <!-- BOTTOM LEFT CORNER -->
+
+<!-- End of Added Math Symbols: Delimiters Entities V0.3 .................. -->
+<!-- ...................................................................... -->
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsn.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsn.ent
new file mode 100644
index 0000000..fbc1e94
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsn.ent
@@ -0,0 +1,101 @@
+<!-- ...................................................................... -->
+<!-- ISO Added Math Symbols: Negated Relations Entities V0.3 .............. -->
+<!-- File iso-amsn.ent .................................................... -->
+
+<!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
+     Information Standards (OASIS).
+
+     $Id: iso-amsn.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $
+
+     Permission to use, copy, modify and distribute this entity set
+     and its accompanying documentation for any purpose and without
+     fee is hereby granted in perpetuity, provided that the above
+     copyright notice and this paragraph appear in all copies. The
+     copyright holders make no representation about the suitability of
+     the entities for any purpose. It is provided "as is" without
+     expressed or implied warranty.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+
+     Derived, in part, from:
+
+       * iso-amsn.gml
+
+           Copyright (C) 1986 International Organization for Standardization
+           Permission to copy in any form is granted for use with
+           conforming SGML systems and applications as defined in
+           ISO 8879, provided this notice is included in all copies.
+
+       * http://www.tug.org/applications/jadetex/unicode.xml
+
+       * ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT
+
+     Please use the following formal public identifier to identify it:
+
+       ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML
+-->
+
+<!ENTITY gnap	"&#xE411;"> <!--  -->
+<!ENTITY gne	"&#x2269;"> <!--  -->
+<!ENTITY gnE	"&#x2269;"> <!--  -->
+<!ENTITY gnsim	"&#x22E7;"> <!-- GREATER-THAN BUT NOT EQUIVALENT TO -->
+<!ENTITY gvnE	"&#x2269;"> <!-- GREATER-THAN BUT NOT EQUAL TO -->
+<!ENTITY lnap	"&#xE2A2;"> <!--  -->
+<!ENTITY lnE	"&#x2268;"> <!--  -->
+<!ENTITY lne	"&#x2268;"> <!--  -->
+<!ENTITY lnsim	"&#x22E6;"> <!--  -->
+<!ENTITY lvnE	"&#x2268;"> <!-- LESS-THAN BUT NOT EQUAL TO -->
+<!ENTITY nap	"&#x2249;"> <!-- NOT ALMOST EQUAL TO -->
+<!ENTITY ncong	"&#x2247;"> <!-- NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO -->
+<!ENTITY nequiv	"&#x2262;"> <!-- NOT IDENTICAL TO -->
+<!ENTITY ngE	"&#x2271;"> <!--  -->
+<!ENTITY nge	"&#x2271;"> <!-- NEITHER GREATER-THAN NOR EQUAL TO -->
+<!ENTITY nges	"&#x2271;"> <!--  -->
+<!ENTITY ngt	"&#x226F;"> <!-- NOT GREATER-THAN -->
+<!ENTITY nle	"&#x2270;"> <!-- NEITHER LESS-THAN NOR EQUAL TO -->
+<!ENTITY nlE	"&#x2270;"> <!--  -->
+<!ENTITY nles	"&#x2270;"> <!--  -->
+<!ENTITY nlt	"&#x226E;"> <!-- NOT LESS-THAN -->
+<!ENTITY nltri	"&#x22EA;"> <!-- NOT NORMAL SUBGROUP OF -->
+<!ENTITY nltrie	"&#x22EC;"> <!-- NOT NORMAL SUBGROUP OF OR EQUAL TO -->
+<!ENTITY nmid	"&#x2224;"> <!-- DOES NOT DIVIDE -->
+<!ENTITY npar	"&#x2226;"> <!-- NOT PARALLEL TO -->
+<!ENTITY npr	"&#x2280;"> <!-- DOES NOT PRECEDE -->
+<!ENTITY npre	"&#x22E0;"> <!-- DOES NOT PRECEDE OR EQUAL -->
+<!ENTITY nrtri	"&#x22EB;"> <!-- DOES NOT CONTAIN AS NORMAL SUBGROUP -->
+<!ENTITY nrtrie	"&#x22ED;"> <!-- DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL -->
+<!ENTITY nsc	"&#x2281;"> <!-- DOES NOT SUCCEED -->
+<!ENTITY nsce	"&#x22E1;"> <!-- DOES NOT SUCCEED OR EQUAL -->
+<!ENTITY nsim	"&#x2241;"> <!--  -->
+<!ENTITY nsime	"&#x2244;"> <!--  -->
+<!ENTITY nsmid	"&#xE2AA;"> <!--  -->
+<!ENTITY nspar	"&#x2226;"> <!-- NOT PARALLEL TO -->
+<!ENTITY nsub	"&#x2284;"> <!-- NOT A SUBSET OF -->
+<!ENTITY nsube	"&#x2288;"> <!--  -->
+<!ENTITY nsubE	"&#x2288;"> <!--  -->
+<!ENTITY nsup	"&#x2285;"> <!-- NOT A SUPERSET OF -->
+<!ENTITY nsupE	"&#x2289;"> <!--  -->
+<!ENTITY nsupe	"&#x2289;"> <!--  -->
+<!ENTITY nvdash	"&#x22AC;"> <!-- DOES NOT PROVE -->
+<!ENTITY nvDash	"&#x22AD;"> <!-- NOT TRUE -->
+<!ENTITY nVDash	"&#x22AF;"> <!-- NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE -->
+<!ENTITY nVdash	"&#x22AE;"> <!-- DOES NOT FORCE -->
+<!ENTITY prnap	"&#x22E8;"> <!--  -->
+<!ENTITY prnE	"&#xE2B3;"> <!--  -->
+<!ENTITY prnsim	"&#x22E8;"> <!--  -->
+<!ENTITY scnap	"&#x22E9;"> <!--  -->
+<!ENTITY scnE	"&#xE2B5;"> <!--  -->
+<!ENTITY scnsim	"&#x22E9;"> <!--  -->
+<!ENTITY subne	"&#x228A;"> <!--  -->
+<!ENTITY subnE	"&#x228A;"> <!-- SUBSET OF WITH NOT EQUAL TO -->
+<!ENTITY supne	"&#x228B;"> <!--  -->
+<!ENTITY supnE	"&#x228B;"> <!--  -->
+<!ENTITY vsubnE	"&#xE2B8;"> <!--  -->
+<!ENTITY vsubne	"&#x228A;"> <!-- SUBSET OF WITH NOT EQUAL TO -->
+<!ENTITY vsupne	"&#x228B;"> <!-- SUPERSET OF WITH NOT EQUAL TO -->
+<!ENTITY vsupnE	"&#x228B;"> <!-- SUPERSET OF WITH NOT EQUAL TO -->
+
+<!-- End of ISO Added Math Symbols: Negated Relations Entities V0.3 ....... -->
+<!-- ...................................................................... -->
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amso.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amso.ent
new file mode 100644
index 0000000..6dc6810
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amso.ent
@@ -0,0 +1,68 @@
+<!-- ...................................................................... -->
+<!-- ISO Added Math Symbols: Ordinary Entities V0.3 ....................... -->
+<!-- File iso-amso.ent .................................................... -->
+
+<!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
+     Information Standards (OASIS).
+
+     $Id: iso-amso.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $
+
+     Permission to use, copy, modify and distribute this entity set
+     and its accompanying documentation for any purpose and without
+     fee is hereby granted in perpetuity, provided that the above
+     copyright notice and this paragraph appear in all copies. The
+     copyright holders make no representation about the suitability of
+     the entities for any purpose. It is provided "as is" without
+     expressed or implied warranty.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+
+     Derived, in part, from:
+
+       * iso-amso.gml
+
+           Copyright (C) 1986 International Organization for Standardization
+           Permission to copy in any form is granted for use with
+           conforming SGML systems and applications as defined in
+           ISO 8879, provided this notice is included in all copies.
+
+       * http://www.tug.org/applications/jadetex/unicode.xml
+
+       * ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT
+
+     Please use the following formal public identifier to identify it:
+
+       ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML
+-->
+
+<!-- iso-amso.ent (initially distributed with DocBook XML DTD V4.1.1beta1) -->
+
+<!-- Derived from the corresponding ISO 8879 standard entity set
+     and the Unicode character mappings provided by Sebastian Rahtz
+     With additional derivations from
+     ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT -->
+
+<!ENTITY ang	"&#x2220;"> <!-- ANGLE -->
+<!ENTITY angmsd	"&#x2221;"> <!-- MEASURED ANGLE -->
+<!ENTITY beth	"&#x2136;"> <!-- BET SYMBOL -->
+<!ENTITY bprime	"&#x2035;"> <!-- REVERSED PRIME -->
+<!ENTITY comp	"&#x2201;"> <!-- COMPLEMENT -->
+<!ENTITY daleth	"&#x2138;"> <!-- DALET SYMBOL -->
+<!ENTITY ell	"&#x2113;"> <!-- SCRIPT SMALL L -->
+<!ENTITY empty	"&#x2205;"> <!--  -->
+<!ENTITY gimel	"&#x2137;"> <!-- GIMEL SYMBOL -->
+<!ENTITY image	"&#x2111;"> <!-- BLACK-LETTER CAPITAL I -->
+<!ENTITY inodot	"&#x0131;"> <!-- LATIN SMALL LETTER DOTLESS I -->
+<!--     jnodot	Unknown unicode character -->
+<!ENTITY nexist	"&#x2204;"> <!-- THERE DOES NOT EXIST -->
+<!ENTITY oS	"&#x24C8;"> <!-- CIRCLED LATIN CAPITAL LETTER S -->
+<!ENTITY planck	"&#x210F;"> <!-- PLANCK CONSTANT OVER TWO PI -->
+<!ENTITY real	"&#x211C;"> <!-- BLACK-LETTER CAPITAL R -->
+<!ENTITY sbsol	"&#xFE68;"> <!-- SMALL REVERSE SOLIDUS -->
+<!ENTITY vprime	"&#x2032;"> <!-- PRIME -->
+<!ENTITY weierp	"&#x2118;"> <!-- SCRIPT CAPITAL P -->
+
+<!-- End of ISO Added Math Symbols: Ordinary Entities V0.3 ................ -->
+<!-- ...................................................................... -->
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsr.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsr.ent
new file mode 100644
index 0000000..9c370b3
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsr.ent
@@ -0,0 +1,126 @@
+<!-- ...................................................................... -->
+<!-- ISO Added Math Symbols: Relations Entities V0.3 ...................... -->
+<!-- File iso-amsr.ent .................................................... -->
+
+<!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
+     Information Standards (OASIS).
+
+     $Id: iso-amsr.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $
+
+     Permission to use, copy, modify and distribute this entity set
+     and its accompanying documentation for any purpose and without
+     fee is hereby granted in perpetuity, provided that the above
+     copyright notice and this paragraph appear in all copies. The
+     copyright holders make no representation about the suitability of
+     the entities for any purpose. It is provided "as is" without
+     expressed or implied warranty.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+
+     Derived, in part, from:
+
+       * iso-amsr.gml
+
+           Copyright (C) 1986 International Organization for Standardization
+           Permission to copy in any form is granted for use with
+           conforming SGML systems and applications as defined in
+           ISO 8879, provided this notice is included in all copies.
+
+       * http://www.tug.org/applications/jadetex/unicode.xml
+
+       * ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT
+
+     Please use the following formal public identifier to identify it:
+
+       ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML
+-->
+
+<!ENTITY ape	"&#x224A;"> <!--  -->
+<!ENTITY asymp	"&#x224D;"> <!-- EQUIVALENT TO -->
+<!ENTITY bcong	"&#x224C;"> <!-- ALL EQUAL TO -->
+<!ENTITY bepsi	"&#x220D;"> <!-- SMALL CONTAINS AS MEMBER -->
+<!ENTITY bowtie	"&#x22C8;"> <!--  -->
+<!ENTITY bsim	"&#x223D;"> <!--  -->
+<!ENTITY bsime	"&#x22CD;"> <!--  -->
+<!ENTITY bump	"&#x224E;"> <!--  -->
+<!ENTITY bumpe	"&#x224F;"> <!--  -->
+<!ENTITY cire	"&#x2257;"> <!--  -->
+<!ENTITY colone	"&#x2254;"> <!--  -->
+<!ENTITY cuepr	"&#x22DE;"> <!--  -->
+<!ENTITY cuesc	"&#x22DF;"> <!--  -->
+<!ENTITY cupre	"&#x227C;"> <!--  -->
+<!ENTITY dashv	"&#x22A3;"> <!--  -->
+<!ENTITY ecir	"&#x2256;"> <!--  -->
+<!ENTITY ecolon	"&#x2255;"> <!--  -->
+<!ENTITY eDot	"&#x2251;"> <!--  -->
+<!ENTITY esdot	"&#x2250;"> <!--  -->
+<!ENTITY efDot	"&#x2252;"> <!--  -->
+<!ENTITY egs	"&#x22DD;"> <!--  -->
+<!ENTITY els	"&#x22DC;"> <!--  -->
+<!ENTITY erDot	"&#x2253;"> <!--  -->
+<!ENTITY fork	"&#x22D4;"> <!--  -->
+<!ENTITY frown	"&#x2322;"> <!--  -->
+<!ENTITY gap	"&#x2273;"> <!-- GREATER-THAN OR EQUIVALENT TO -->
+<!ENTITY gsdot	"&#x22D7;"> <!--  -->
+<!ENTITY gE	"&#x2267;"> <!--  -->
+<!ENTITY gel	"&#x22DB;"> <!--  -->
+<!ENTITY gEl	"&#x22DB;"> <!--  -->
+<!ENTITY ges	"&#x2265;"> <!-- GREATER-THAN OR EQUAL TO -->
+<!ENTITY Gg	"&#x22D9;"> <!-- VERY MUCH GREATER-THAN -->
+<!ENTITY gl	"&#x2277;"> <!--  -->
+<!ENTITY gsim	"&#x2273;"> <!-- GREATER-THAN OR EQUIVALENT TO -->
+<!ENTITY Gt	"&#x226B;"> <!-- MUCH GREATER-THAN -->
+<!ENTITY lap	"&#x2272;"> <!-- LESS-THAN OR EQUIVALENT TO -->
+<!ENTITY ldot	"&#x22D6;"> <!--  -->
+<!ENTITY lE	"&#x2266;"> <!--  -->
+<!ENTITY lEg	"&#x22DA;"> <!--  -->
+<!ENTITY leg	"&#x22DA;"> <!--  -->
+<!ENTITY les	"&#x2264;"> <!-- LESS-THAN OR EQUAL TO -->
+<!ENTITY lg	"&#x2276;"> <!-- LESS-THAN OR GREATER-THAN -->
+<!ENTITY Ll	"&#x22D8;"> <!--  -->
+<!ENTITY lsim	"&#x2272;"> <!-- LESS-THAN OR EQUIVALENT TO -->
+<!ENTITY Lt	"&#x226A;"> <!-- MUCH LESS-THAN -->
+<!ENTITY ltrie	"&#x22B4;"> <!--  -->
+<!ENTITY mid	"&#x2223;"> <!--  -->
+<!ENTITY models	"&#x22A7;"> <!-- MODELS -->
+<!ENTITY pr	"&#x227A;"> <!--  -->
+<!ENTITY prap	"&#x227E;"> <!--  -->
+<!ENTITY pre	"&#x227C;"> <!--  -->
+<!ENTITY prsim	"&#x227E;"> <!--  -->
+<!ENTITY rtrie	"&#x22B5;"> <!--  -->
+<!ENTITY samalg	"&#x2210;"> <!--  -->
+<!ENTITY sc	"&#x227B;"> <!--  -->
+<!ENTITY scap	"&#x227F;"> <!--  -->
+<!ENTITY sccue	"&#x227D;"> <!--  -->
+<!ENTITY sce	"&#x227D;"> <!--  -->
+<!ENTITY scsim	"&#x227F;"> <!--  -->
+<!ENTITY sfrown	"&#x2322;"> <!-- FROWN -->
+<!ENTITY smid	"&#xE301;"> <!--  -->
+<!ENTITY smile	"&#x2323;"> <!--  -->
+<!ENTITY spar	"&#x2225;"> <!-- PARALLEL TO -->
+<!ENTITY sqsub	"&#x228F;"> <!--  -->
+<!ENTITY sqsube	"&#x2291;"> <!--  -->
+<!ENTITY sqsup	"&#x2290;"> <!--  -->
+<!ENTITY sqsupe	"&#x2292;"> <!--  -->
+<!ENTITY ssmile	"&#x2323;"> <!-- SMILE -->
+<!ENTITY Sub	"&#x22D0;"> <!--  -->
+<!ENTITY subE	"&#x2286;"> <!--  -->
+<!ENTITY Sup	"&#x22D1;"> <!--  -->
+<!ENTITY supE	"&#x2287;"> <!--  -->
+<!ENTITY thkap	"&#x2248;"> <!-- ALMOST EQUAL TO -->
+<!ENTITY thksim	"&#x223C;"> <!-- TILDE OPERATOR -->
+<!ENTITY trie	"&#x225C;"> <!--  -->
+<!ENTITY twixt	"&#x226C;"> <!-- BETWEEN -->
+<!ENTITY vdash	"&#x22A2;"> <!--  -->
+<!ENTITY Vdash	"&#x22A9;"> <!--  -->
+<!ENTITY vDash	"&#x22A8;"> <!--  -->
+<!ENTITY veebar	"&#x22BB;"> <!--  -->
+<!ENTITY vltri	"&#x22B2;"> <!--  -->
+<!ENTITY vprop	"&#x221D;"> <!--  -->
+<!ENTITY vrtri	"&#x22B3;"> <!--  -->
+<!ENTITY Vvdash	"&#x22AA;"> <!--  -->
+
+<!-- End of ISO Added Math Symbols: Relations Entities V0.3 ............... -->
+<!-- ...................................................................... -->
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-box.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-box.ent
new file mode 100644
index 0000000..904916c
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-box.ent
@@ -0,0 +1,82 @@
+<!-- ...................................................................... -->
+<!-- ISO Box and Line Drawing Entities V0.3 ............................... -->
+<!-- File iso-box.ent ..................................................... -->
+
+<!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
+     Information Standards (OASIS).
+
+     $Id: iso-box.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $
+
+     Permission to use, copy, modify and distribute this entity set
+     and its accompanying documentation for any purpose and without
+     fee is hereby granted in perpetuity, provided that the above
+     copyright notice and this paragraph appear in all copies. The
+     copyright holders make no representation about the suitability of
+     the entities for any purpose. It is provided "as is" without
+     expressed or implied warranty.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+
+     Derived, in part, from:
+
+       * iso-box.gml
+
+           Copyright (C) 1986 International Organization for Standardization
+           Permission to copy in any form is granted for use with
+           conforming SGML systems and applications as defined in
+           ISO 8879, provided this notice is included in all copies.
+
+       * http://www.tug.org/applications/jadetex/unicode.xml
+
+       * ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT
+
+     Please use the following formal public identifier to identify it:
+
+       ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML
+-->
+
+<!ENTITY boxh	"&#x2500;"> <!-- BOX DRAWINGS LIGHT HORIZONTAL -->
+<!ENTITY boxv	"&#x2502;"> <!-- BOX DRAWINGS LIGHT VERTICAL -->
+<!ENTITY boxur	"&#x2514;"> <!-- BOX DRAWINGS LIGHT UP AND RIGHT -->
+<!ENTITY boxul	"&#x2518;"> <!-- BOX DRAWINGS LIGHT UP AND LEFT -->
+<!ENTITY boxdl	"&#x2510;"> <!-- BOX DRAWINGS LIGHT DOWN AND LEFT -->
+<!ENTITY boxdr	"&#x250C;"> <!-- BOX DRAWINGS LIGHT DOWN AND RIGHT -->
+<!ENTITY boxvr	"&#x251C;"> <!-- BOX DRAWINGS LIGHT VERTICAL AND RIGHT -->
+<!ENTITY boxhu	"&#x2534;"> <!-- BOX DRAWINGS LIGHT UP AND HORIZONTAL -->
+<!ENTITY boxvl	"&#x2524;"> <!-- BOX DRAWINGS LIGHT VERTICAL AND LEFT -->
+<!ENTITY boxhd	"&#x252C;"> <!-- BOX DRAWINGS LIGHT DOWN AND HORIZONTAL -->
+<!ENTITY boxvh	"&#x253C;"> <!-- BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL -->
+<!ENTITY boxvR	"&#x255E;"> <!-- BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE -->
+<!ENTITY boxhU	"&#x2567;"> <!-- BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE -->
+<!ENTITY boxvL	"&#x2561;"> <!-- BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE -->
+<!ENTITY boxhD	"&#x2564;"> <!-- BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE -->
+<!ENTITY boxvH	"&#x256A;"> <!-- BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE -->
+<!ENTITY boxH	"&#x2550;"> <!-- BOX DRAWINGS DOUBLE HORIZONTAL -->
+<!ENTITY boxV	"&#x2551;"> <!-- BOX DRAWINGS DOUBLE VERTICAL -->
+<!ENTITY boxUR	"&#x2558;"> <!-- BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE -->
+<!ENTITY boxUL	"&#x255B;"> <!-- BOX DRAWINGS UP SINGLE AND LEFT DOUBLE -->
+<!ENTITY boxDL	"&#x2555;"> <!-- BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE -->
+<!ENTITY boxDR	"&#x2552;"> <!-- BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE -->
+<!ENTITY boxVR	"&#x255F;"> <!-- BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE -->
+<!ENTITY boxHU	"&#x2568;"> <!-- BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE -->
+<!ENTITY boxVL	"&#x2562;"> <!-- BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE -->
+<!ENTITY boxHD	"&#x2565;"> <!-- BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE -->
+<!ENTITY boxVH	"&#x256B;"> <!-- BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE -->
+<!ENTITY boxVr	"&#x2560;"> <!-- BOX DRAWINGS DOUBLE VERTICAL AND RIGHT -->
+<!ENTITY boxHu	"&#x2569;"> <!-- BOX DRAWINGS DOUBLE UP AND HORIZONTAL -->
+<!ENTITY boxVl	"&#x2563;"> <!-- BOX DRAWINGS DOUBLE VERTICAL AND LEFT -->
+<!ENTITY boxHd	"&#x2566;"> <!-- BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL -->
+<!ENTITY boxVh	"&#x256C;"> <!-- BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL -->
+<!ENTITY boxuR	"&#x2559;"> <!-- BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE -->
+<!ENTITY boxUl	"&#x255C;"> <!-- BOX DRAWINGS UP DOUBLE AND LEFT SINGLE -->
+<!ENTITY boxdL	"&#x2556;"> <!-- BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE -->
+<!ENTITY boxDr	"&#x2553;"> <!-- BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE -->
+<!ENTITY boxUr	"&#x255A;"> <!-- BOX DRAWINGS DOUBLE UP AND RIGHT -->
+<!ENTITY boxuL	"&#x255D;"> <!-- BOX DRAWINGS DOUBLE UP AND LEFT -->
+<!ENTITY boxDl	"&#x2557;"> <!-- BOX DRAWINGS DOUBLE DOWN AND LEFT -->
+<!ENTITY boxdR	"&#x2554;"> <!-- BOX DRAWINGS DOUBLE DOWN AND RIGHT -->
+
+<!-- End of ISO Box and Line Drawing Entities V0.3 ........................ -->
+<!-- ...................................................................... -->
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr1.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr1.ent
new file mode 100644
index 0000000..6507c79
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr1.ent
@@ -0,0 +1,109 @@
+<!-- ...................................................................... -->
+<!-- ISO Russian Cyrillic Entities V0.3 ................................... -->
+<!-- File iso-cyr1.ent .................................................... -->
+
+<!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
+     Information Standards (OASIS).
+
+     $Id: iso-cyr1.ent,v 1.1 2008/05/27 19:26:06 jsumali Exp $
+
+     Permission to use, copy, modify and distribute this entity set
+     and its accompanying documentation for any purpose and without
+     fee is hereby granted in perpetuity, provided that the above
+     copyright notice and this paragraph appear in all copies. The
+     copyright holders make no representation about the suitability of
+     the entities for any purpose. It is provided "as is" without
+     expressed or implied warranty.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+
+     Derived, in part, from:
+
+       * iso-cyr1.gml
+
+           Copyright (C) 1986 International Organization for Standardization
+           Permission to copy in any form is granted for use with
+           conforming SGML systems and applications as defined in
+           ISO 8879, provided this notice is included in all copies.
+
+       * http://www.tug.org/applications/jadetex/unicode.xml
+
+       * ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT
+
+     Please use the following formal public identifier to identify it:
+
+       ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML
+-->
+
+<!ENTITY acy	"&#x0430;"> <!-- CYRILLIC SMALL LETTER A -->
+<!ENTITY Acy	"&#x0410;"> <!-- CYRILLIC CAPITAL LETTER A -->
+<!ENTITY bcy	"&#x0431;"> <!-- CYRILLIC SMALL LETTER BE -->
+<!ENTITY Bcy	"&#x0411;"> <!-- CYRILLIC CAPITAL LETTER BE -->
+<!ENTITY vcy	"&#x0432;"> <!-- CYRILLIC SMALL LETTER VE -->
+<!ENTITY Vcy	"&#x0412;"> <!-- CYRILLIC CAPITAL LETTER VE -->
+<!ENTITY gcy	"&#x0433;"> <!-- CYRILLIC SMALL LETTER GHE -->
+<!ENTITY Gcy	"&#x0413;"> <!-- CYRILLIC CAPITAL LETTER GHE -->
+<!ENTITY dcy	"&#x0434;"> <!-- CYRILLIC SMALL LETTER DE -->
+<!ENTITY Dcy	"&#x0414;"> <!-- CYRILLIC CAPITAL LETTER DE -->
+<!ENTITY iecy	"&#x0435;"> <!-- CYRILLIC SMALL LETTER IE -->
+<!ENTITY IEcy	"&#x0415;"> <!-- CYRILLIC CAPITAL LETTER IE -->
+<!ENTITY iocy	"&#x0451;"> <!-- CYRILLIC SMALL LETTER IO -->
+<!ENTITY IOcy	"&#x0401;"> <!-- CYRILLIC CAPITAL LETTER IO -->
+<!ENTITY zhcy	"&#x0436;"> <!-- CYRILLIC SMALL LETTER ZHE -->
+<!ENTITY ZHcy	"&#x0416;"> <!-- CYRILLIC CAPITAL LETTER ZHE -->
+<!ENTITY zcy	"&#x0437;"> <!-- CYRILLIC SMALL LETTER ZE -->
+<!ENTITY Zcy	"&#x0417;"> <!-- CYRILLIC CAPITAL LETTER ZE -->
+<!ENTITY icy	"&#x0438;"> <!-- CYRILLIC SMALL LETTER I -->
+<!ENTITY Icy	"&#x0418;"> <!-- CYRILLIC CAPITAL LETTER I -->
+<!ENTITY jcy	"&#x0439;"> <!-- CYRILLIC SMALL LETTER SHORT I -->
+<!ENTITY Jcy	"&#x0419;"> <!-- CYRILLIC CAPITAL LETTER SHORT I -->
+<!ENTITY kcy	"&#x043A;"> <!-- CYRILLIC SMALL LETTER KA -->
+<!ENTITY Kcy	"&#x041A;"> <!-- CYRILLIC CAPITAL LETTER KA -->
+<!ENTITY lcy	"&#x043B;"> <!-- CYRILLIC SMALL LETTER EL -->
+<!ENTITY Lcy	"&#x041B;"> <!-- CYRILLIC CAPITAL LETTER EL -->
+<!ENTITY mcy	"&#x043C;"> <!-- CYRILLIC SMALL LETTER EM -->
+<!ENTITY Mcy	"&#x041C;"> <!-- CYRILLIC CAPITAL LETTER EM -->
+<!ENTITY ncy	"&#x043D;"> <!-- CYRILLIC SMALL LETTER EN -->
+<!ENTITY Ncy	"&#x041D;"> <!-- CYRILLIC CAPITAL LETTER EN -->
+<!ENTITY ocy	"&#x043E;"> <!-- CYRILLIC SMALL LETTER O -->
+<!ENTITY Ocy	"&#x041E;"> <!-- CYRILLIC CAPITAL LETTER O -->
+<!ENTITY pcy	"&#x043F;"> <!-- CYRILLIC SMALL LETTER PE -->
+<!ENTITY Pcy	"&#x041F;"> <!-- CYRILLIC CAPITAL LETTER PE -->
+<!ENTITY rcy	"&#x0440;"> <!-- CYRILLIC SMALL LETTER ER -->
+<!ENTITY Rcy	"&#x0420;"> <!-- CYRILLIC CAPITAL LETTER ER -->
+<!ENTITY scy	"&#x0441;"> <!-- CYRILLIC SMALL LETTER ES -->
+<!ENTITY Scy	"&#x0421;"> <!-- CYRILLIC CAPITAL LETTER ES -->
+<!ENTITY tcy	"&#x0442;"> <!-- CYRILLIC SMALL LETTER TE -->
+<!ENTITY Tcy	"&#x0422;"> <!-- CYRILLIC CAPITAL LETTER TE -->
+<!ENTITY ucy	"&#x0443;"> <!-- CYRILLIC SMALL LETTER U -->
+<!ENTITY Ucy	"&#x0423;"> <!-- CYRILLIC CAPITAL LETTER U -->
+<!ENTITY fcy	"&#x0444;"> <!-- CYRILLIC SMALL LETTER EF -->
+<!ENTITY Fcy	"&#x0424;"> <!-- CYRILLIC CAPITAL LETTER EF -->
+<!ENTITY khcy	"&#x0445;"> <!-- CYRILLIC SMALL LETTER HA -->
+<!ENTITY KHcy	"&#x0425;"> <!-- CYRILLIC CAPITAL LETTER HA -->
+<!ENTITY tscy	"&#x0446;"> <!-- CYRILLIC SMALL LETTER TSE -->
+<!ENTITY TScy	"&#x0426;"> <!-- CYRILLIC CAPITAL LETTER TSE -->
+<!ENTITY chcy	"&#x0447;"> <!-- CYRILLIC SMALL LETTER CHE -->
+<!ENTITY CHcy	"&#x0427;"> <!-- CYRILLIC CAPITAL LETTER CHE -->
+<!ENTITY shcy	"&#x0448;"> <!-- CYRILLIC SMALL LETTER SHA -->
+<!ENTITY SHcy	"&#x0428;"> <!-- CYRILLIC CAPITAL LETTER SHA -->
+<!ENTITY shchcy	"&#x0449;"> <!-- CYRILLIC SMALL LETTER SHCHA -->
+<!ENTITY SHCHcy	"&#x0429;"> <!-- CYRILLIC CAPITAL LETTER SHCHA -->
+<!ENTITY hardcy	"&#x044A;"> <!-- CYRILLIC SMALL LETTER HARD SIGN -->
+<!ENTITY HARDcy	"&#x042A;"> <!-- CYRILLIC CAPITAL LETTER HARD SIGN -->
+<!ENTITY ycy	"&#x044B;"> <!-- CYRILLIC SMALL LETTER YERU -->
+<!ENTITY Ycy	"&#x042B;"> <!-- CYRILLIC CAPITAL LETTER YERU -->
+<!ENTITY softcy	"&#x044C;"> <!-- CYRILLIC SMALL LETTER SOFT SIGN -->
+<!ENTITY SOFTcy	"&#x042C;"> <!-- CYRILLIC CAPITAL LETTER SOFT SIGN -->
+<!ENTITY ecy	"&#x044D;"> <!-- CYRILLIC SMALL LETTER E -->
+<!ENTITY Ecy	"&#x042D;"> <!-- CYRILLIC CAPITAL LETTER E -->
+<!ENTITY yucy	"&#x044E;"> <!-- CYRILLIC SMALL LETTER YU -->
+<!ENTITY YUcy	"&#x042E;"> <!-- CYRILLIC CAPITAL LETTER YU -->
+<!ENTITY yacy	"&#x044F;"> <!-- CYRILLIC SMALL LETTER YA -->
+<!ENTITY YAcy	"&#x042F;"> <!-- CYRILLIC CAPITAL LETTER YA -->
+<!ENTITY numero	"&#x2116;"> <!-- NUMERO SIGN -->
+
+<!-- End of ISO Russian Cyrillic Entities V0.3 ............................ -->
+<!-- ...................................................................... -->
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr2.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr2.ent
new file mode 100644
index 0000000..50f5347
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr2.ent
@@ -0,0 +1,68 @@
+<!-- ...................................................................... -->
+<!-- ISO Non-Russian Cyrillic Entities V0.3 ............................... -->
+<!-- File iso-cyr2.ent .................................................... -->
+
+<!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
+     Information Standards (OASIS).
+
+     $Id: iso-cyr2.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $
+
+     Permission to use, copy, modify and distribute this entity set
+     and its accompanying documentation for any purpose and without
+     fee is hereby granted in perpetuity, provided that the above
+     copyright notice and this paragraph appear in all copies. The
+     copyright holders make no representation about the suitability of
+     the entities for any purpose. It is provided "as is" without
+     expressed or implied warranty.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+
+     Derived, in part, from:
+
+       * iso-cyr2.gml
+
+           Copyright (C) 1986 International Organization for Standardization
+           Permission to copy in any form is granted for use with
+           conforming SGML systems and applications as defined in
+           ISO 8879, provided this notice is included in all copies.
+
+       * http://www.tug.org/applications/jadetex/unicode.xml
+
+       * ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT
+
+     Please use the following formal public identifier to identify it:
+
+       ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML
+-->
+
+<!ENTITY djcy	"&#x0452;"> <!-- CYRILLIC SMALL LETTER DJE -->
+<!ENTITY DJcy	"&#x0402;"> <!-- CYRILLIC CAPITAL LETTER DJE -->
+<!ENTITY gjcy	"&#x0453;"> <!-- CYRILLIC SMALL LETTER GJE -->
+<!ENTITY GJcy	"&#x0403;"> <!-- CYRILLIC CAPITAL LETTER GJE -->
+<!ENTITY jukcy	"&#x0454;"> <!-- CYRILLIC SMALL LETTER UKRAINIAN IE -->
+<!ENTITY Jukcy	"&#x0404;"> <!-- CYRILLIC CAPITAL LETTER UKRAINIAN IE -->
+<!ENTITY dscy	"&#x0455;"> <!-- CYRILLIC SMALL LETTER DZE -->
+<!ENTITY DScy	"&#x0405;"> <!-- CYRILLIC CAPITAL LETTER DZE -->
+<!ENTITY iukcy	"&#x0456;"> <!-- CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I -->
+<!ENTITY Iukcy	"&#x0406;"> <!-- CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I -->
+<!ENTITY yicy	"&#x0457;"> <!-- CYRILLIC SMALL LETTER YI -->
+<!ENTITY YIcy	"&#x0407;"> <!-- CYRILLIC CAPITAL LETTER YI -->
+<!ENTITY jsercy	"&#x0458;"> <!-- CYRILLIC SMALL LETTER JE -->
+<!ENTITY Jsercy	"&#x0408;"> <!-- CYRILLIC CAPITAL LETTER JE -->
+<!ENTITY ljcy	"&#x0459;"> <!-- CYRILLIC SMALL LETTER LJE -->
+<!ENTITY LJcy	"&#x0409;"> <!-- CYRILLIC CAPITAL LETTER LJE -->
+<!ENTITY njcy	"&#x045A;"> <!-- CYRILLIC SMALL LETTER NJE -->
+<!ENTITY NJcy	"&#x040A;"> <!-- CYRILLIC CAPITAL LETTER NJE -->
+<!ENTITY tshcy	"&#x045B;"> <!-- CYRILLIC SMALL LETTER TSHE -->
+<!ENTITY TSHcy	"&#x040B;"> <!-- CYRILLIC CAPITAL LETTER TSHE -->
+<!ENTITY kjcy	"&#x045C;"> <!-- CYRILLIC SMALL LETTER KJE -->
+<!ENTITY KJcy	"&#x040C;"> <!-- CYRILLIC CAPITAL LETTER KJE -->
+<!ENTITY ubrcy	"&#x045E;"> <!-- CYRILLIC SMALL LETTER SHORT U -->
+<!ENTITY Ubrcy	"&#x040E;"> <!-- CYRILLIC CAPITAL LETTER SHORT U -->
+<!ENTITY dzcy	"&#x045F;"> <!-- CYRILLIC SMALL LETTER DZHE -->
+<!ENTITY DZcy	"&#x040F;"> <!-- CYRILLIC CAPITAL LETTER DZHE -->
+
+<!-- End of ISO Non-Russian Cyrillic Entities V0.3 ........................ -->
+<!-- ...................................................................... -->
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-dia.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-dia.ent
new file mode 100644
index 0000000..278e5d9
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-dia.ent
@@ -0,0 +1,56 @@
+<!-- ...................................................................... -->
+<!-- ISO Diacritical Marks Entities V0.3 .................................. -->
+<!-- File iso-dia.ent ..................................................... -->
+
+<!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
+     Information Standards (OASIS).
+
+     $Id: iso-dia.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $
+
+     Permission to use, copy, modify and distribute this entity set
+     and its accompanying documentation for any purpose and without
+     fee is hereby granted in perpetuity, provided that the above
+     copyright notice and this paragraph appear in all copies. The
+     copyright holders make no representation about the suitability of
+     the entities for any purpose. It is provided "as is" without
+     expressed or implied warranty.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+
+     Derived, in part, from:
+
+       * iso-dia.gml
+
+           Copyright (C) 1986 International Organization for Standardization
+           Permission to copy in any form is granted for use with
+           conforming SGML systems and applications as defined in
+           ISO 8879, provided this notice is included in all copies.
+
+       * http://www.tug.org/applications/jadetex/unicode.xml
+
+       * ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT
+
+     Please use the following formal public identifier to identify it:
+
+       ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML
+-->
+
+<!ENTITY acute	"&#x00B4;"> <!-- ACUTE ACCENT -->
+<!ENTITY breve	"&#x02D8;"> <!-- BREVE -->
+<!ENTITY caron	"&#x02C7;"> <!-- CARON -->
+<!ENTITY cedil	"&#x00B8;"> <!-- CEDILLA -->
+<!ENTITY circ	"&#x005E;"> <!-- RING OPERATOR -->
+<!ENTITY dblac	"&#x02DD;"> <!-- DOUBLE ACUTE ACCENT -->
+<!ENTITY die	"&#x00A8;"> <!--  -->
+<!ENTITY dot	"&#x02D9;"> <!-- DOT ABOVE -->
+<!ENTITY grave	"&#x0060;"> <!-- GRAVE ACCENT -->
+<!ENTITY macr	"&#x00AF;"> <!-- MACRON -->
+<!ENTITY ogon	"&#x02DB;"> <!-- OGONEK -->
+<!ENTITY ring	"&#x02DA;"> <!-- RING ABOVE -->
+<!ENTITY tilde	"&#x02DC;"> <!-- TILDE -->
+<!ENTITY uml	"&#x00A8;"> <!--  -->
+
+<!-- End of ISO Diacritical Marks Entities V0.3 ........................... -->
+<!-- ...................................................................... -->
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk1.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk1.ent
new file mode 100644
index 0000000..848f203
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk1.ent
@@ -0,0 +1,91 @@
+<!-- ...................................................................... -->
+<!-- ISO Greek Letters Entities V0.3 ...................................... -->
+<!-- File iso-grk1.ent .................................................... -->
+
+<!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
+     Information Standards (OASIS).
+
+     $Id: iso-grk1.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $
+
+     Permission to use, copy, modify and distribute this entity set
+     and its accompanying documentation for any purpose and without
+     fee is hereby granted in perpetuity, provided that the above
+     copyright notice and this paragraph appear in all copies. The
+     copyright holders make no representation about the suitability of
+     the entities for any purpose. It is provided "as is" without
+     expressed or implied warranty.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+
+     Derived, in part, from:
+
+       * iso-grk1.gml
+
+           Copyright (C) 1986 International Organization for Standardization
+           Permission to copy in any form is granted for use with
+           conforming SGML systems and applications as defined in
+           ISO 8879, provided this notice is included in all copies.
+
+       * http://www.tug.org/applications/jadetex/unicode.xml
+
+       * ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT
+
+     Please use the following formal public identifier to identify it:
+
+       ISO 8879:1986//ENTITIES Greek Letters//EN//XML
+-->
+
+<!ENTITY agr	"&#x03B1;"> <!--  -->
+<!ENTITY Agr	"&#x0391;"> <!-- GREEK CAPITAL LETTER ALPHA -->
+<!ENTITY bgr	"&#x03B2;"> <!-- GREEK SMALL LETTER BETA -->
+<!ENTITY Bgr	"&#x0392;"> <!-- GREEK CAPITAL LETTER BETA -->
+<!ENTITY ggr	"&#x03B3;"> <!-- GREEK SMALL LETTER GAMMA -->
+<!ENTITY Ggr	"&#x0393;"> <!-- GREEK CAPITAL LETTER GAMMA -->
+<!ENTITY dgr	"&#x03B4;"> <!-- GREEK SMALL LETTER DELTA -->
+<!ENTITY Dgr	"&#x0394;"> <!-- GREEK CAPITAL LETTER DELTA -->
+<!ENTITY egr	"&#x03B5;"> <!--  -->
+<!ENTITY Egr	"&#x0395;"> <!-- GREEK CAPITAL LETTER EPSILON -->
+<!ENTITY zgr	"&#x03B6;"> <!-- GREEK SMALL LETTER ZETA -->
+<!ENTITY Zgr	"&#x0396;"> <!-- GREEK CAPITAL LETTER ZETA -->
+<!ENTITY eegr	"&#x03B7;"> <!-- GREEK SMALL LETTER ETA -->
+<!ENTITY EEgr	"&#x0397;"> <!-- GREEK CAPITAL LETTER ETA -->
+<!ENTITY thgr	"&#x03B8;"> <!--  -->
+<!ENTITY THgr	"&#x0398;"> <!-- GREEK CAPITAL LETTER THETA -->
+<!ENTITY igr	"&#x03B9;"> <!-- GREEK SMALL LETTER IOTA -->
+<!ENTITY Igr	"&#x0399;"> <!-- GREEK CAPITAL LETTER IOTA -->
+<!ENTITY kgr	"&#x03BA;"> <!-- GREEK SMALL LETTER KAPPA -->
+<!ENTITY Kgr	"&#x039A;"> <!-- GREEK CAPITAL LETTER KAPPA -->
+<!ENTITY lgr	"&#x03BB;"> <!-- GREEK SMALL LETTER LAMDA -->
+<!ENTITY Lgr	"&#x039B;"> <!-- GREEK CAPITAL LETTER LAMDA -->
+<!ENTITY mgr	"&#x03BC;"> <!-- GREEK SMALL LETTER MU -->
+<!ENTITY Mgr	"&#x039C;"> <!-- GREEK CAPITAL LETTER MU -->
+<!ENTITY ngr	"&#x03BD;"> <!-- GREEK SMALL LETTER NU -->
+<!ENTITY Ngr	"&#x039D;"> <!-- GREEK CAPITAL LETTER NU -->
+<!ENTITY xgr	"&#x03BE;"> <!-- GREEK SMALL LETTER XI -->
+<!ENTITY Xgr	"&#x039E;"> <!-- GREEK CAPITAL LETTER XI -->
+<!ENTITY ogr	"&#x03BF;"> <!-- GREEK SMALL LETTER OMICRON -->
+<!ENTITY Ogr	"&#x039F;"> <!-- GREEK CAPITAL LETTER OMICRON -->
+<!ENTITY pgr	"&#x03C0;"> <!-- GREEK SMALL LETTER PI -->
+<!ENTITY Pgr	"&#x03A0;"> <!-- GREEK CAPITAL LETTER PI -->
+<!ENTITY rgr	"&#x03C1;"> <!-- GREEK SMALL LETTER RHO -->
+<!ENTITY Rgr	"&#x03A1;"> <!-- GREEK CAPITAL LETTER RHO -->
+<!ENTITY sgr	"&#x03C3;"> <!-- GREEK SMALL LETTER SIGMA -->
+<!ENTITY Sgr	"&#x03A3;"> <!-- GREEK CAPITAL LETTER SIGMA -->
+<!ENTITY sfgr	"&#x03C2;"> <!--  -->
+<!ENTITY tgr	"&#x03C4;"> <!-- GREEK SMALL LETTER TAU -->
+<!ENTITY Tgr	"&#x03A4;"> <!-- GREEK CAPITAL LETTER TAU -->
+<!ENTITY ugr	"&#x03C5;"> <!-- GREEK SMALL LETTER UPSILON -->
+<!ENTITY Ugr	"&#x03A5;"> <!--  -->
+<!ENTITY phgr	"&#x03C6;"> <!-- GREEK SMALL LETTER PHI -->
+<!ENTITY PHgr	"&#x03A6;"> <!-- GREEK CAPITAL LETTER PHI -->
+<!ENTITY khgr	"&#x03C7;"> <!-- GREEK SMALL LETTER CHI -->
+<!ENTITY KHgr	"&#x03A7;"> <!-- GREEK CAPITAL LETTER CHI -->
+<!ENTITY psgr	"&#x03C8;"> <!-- GREEK SMALL LETTER PSI -->
+<!ENTITY PSgr	"&#x03A8;"> <!-- GREEK CAPITAL LETTER PSI -->
+<!ENTITY ohgr	"&#x03C9;"> <!-- GREEK SMALL LETTER OMEGA -->
+<!ENTITY OHgr	"&#x03A9;"> <!-- GREEK CAPITAL LETTER OMEGA -->
+
+<!-- End of ISO Greek Letters V0.3 ........................................ -->
+<!-- ...................................................................... -->
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk2.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk2.ent
new file mode 100644
index 0000000..a75f5b0
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk2.ent
@@ -0,0 +1,62 @@
+<!-- ...................................................................... -->
+<!-- ISO Monotoniko Greek Entities V0.3 ................................... -->
+<!-- File iso-grk2.ent .................................................... -->
+
+<!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
+     Information Standards (OASIS).
+
+     $Id: iso-grk2.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $
+
+     Permission to use, copy, modify and distribute this entity set
+     and its accompanying documentation for any purpose and without
+     fee is hereby granted in perpetuity, provided that the above
+     copyright notice and this paragraph appear in all copies. The
+     copyright holders make no representation about the suitability of
+     the entities for any purpose. It is provided "as is" without
+     expressed or implied warranty.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+
+     Derived, in part, from:
+
+       * iso-grk2.gml
+
+           Copyright (C) 1986 International Organization for Standardization
+           Permission to copy in any form is granted for use with
+           conforming SGML systems and applications as defined in
+           ISO 8879, provided this notice is included in all copies.
+
+       * http://www.tug.org/applications/jadetex/unicode.xml
+
+       * ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT
+
+     Please use the following formal public identifier to identify it:
+
+       ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML
+-->
+
+<!ENTITY aacgr	"&#x03AC;"> <!-- GREEK SMALL LETTER ALPHA WITH TONOS -->
+<!ENTITY Aacgr	"&#x0386;"> <!-- GREEK CAPITAL LETTER ALPHA WITH TONOS -->
+<!ENTITY eacgr	"&#x03AD;"> <!-- GREEK SMALL LETTER EPSILON WITH TONOS -->
+<!ENTITY Eacgr	"&#x0388;"> <!-- GREEK CAPITAL LETTER EPSILON WITH TONOS -->
+<!ENTITY eeacgr	"&#x03AE;"> <!-- GREEK SMALL LETTER ETA WITH TONOS -->
+<!ENTITY EEacgr	"&#x0389;"> <!-- GREEK CAPITAL LETTER ETA WITH TONOS -->
+<!ENTITY idigr	"&#x03CA;"> <!-- GREEK SMALL LETTER IOTA WITH DIALYTIKA -->
+<!ENTITY Idigr	"&#x03AA;"> <!-- GREEK CAPITAL LETTER IOTA WITH DIALYTIKA -->
+<!ENTITY iacgr	"&#x03AF;"> <!-- GREEK SMALL LETTER IOTA WITH TONOS -->
+<!ENTITY Iacgr	"&#x038A;"> <!-- GREEK CAPITAL LETTER IOTA WITH TONOS -->
+<!ENTITY idiagr	"&#x0390;"> <!-- GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS -->
+<!ENTITY oacgr	"&#x03CC;"> <!-- GREEK SMALL LETTER OMICRON WITH TONOS -->
+<!ENTITY Oacgr	"&#x038C;"> <!-- GREEK CAPITAL LETTER OMICRON WITH TONOS -->
+<!ENTITY udigr	"&#x03CB;"> <!-- GREEK SMALL LETTER UPSILON WITH DIALYTIKA -->
+<!ENTITY Udigr	"&#x03AB;"> <!-- GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA -->
+<!ENTITY uacgr	"&#x03CD;"> <!-- GREEK SMALL LETTER UPSILON WITH TONOS -->
+<!ENTITY Uacgr	"&#x038E;"> <!-- GREEK CAPITAL LETTER UPSILON WITH TONOS -->
+<!ENTITY udiagr	"&#x03B0;"> <!-- GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS -->
+<!ENTITY ohacgr	"&#x03CE;"> <!-- GREEK SMALL LETTER OMEGA WITH TONOS -->
+<!ENTITY OHacgr	"&#x038F;"> <!-- GREEK CAPITAL LETTER OMEGA WITH TONOS -->
+
+<!-- End of ISO Monotoniko Greek Entities V0.3 ............................ -->
+<!-- ...................................................................... -->
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk3.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk3.ent
new file mode 100644
index 0000000..070ef25
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk3.ent
@@ -0,0 +1,85 @@
+<!-- ...................................................................... -->
+<!-- ISO Greek Symbols Entities V0.3 ...................................... -->
+<!-- File iso-grk3.ent .................................................... -->
+
+<!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
+     Information Standards (OASIS).
+
+     $Id: iso-grk3.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $
+
+     Permission to use, copy, modify and distribute this entity set
+     and its accompanying documentation for any purpose and without
+     fee is hereby granted in perpetuity, provided that the above
+     copyright notice and this paragraph appear in all copies. The
+     copyright holders make no representation about the suitability of
+     the entities for any purpose. It is provided "as is" without
+     expressed or implied warranty.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+
+     Derived, in part, from:
+
+       * iso-grk3.gml
+
+           Copyright (C) 1986 International Organization for Standardization
+           Permission to copy in any form is granted for use with
+           conforming SGML systems and applications as defined in
+           ISO 8879, provided this notice is included in all copies.
+
+       * http://www.tug.org/applications/jadetex/unicode.xml
+
+       * ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT
+
+     Please use the following formal public identifier to identify it:
+
+       ISO 8879:1986//ENTITIES Greek Symbols//EN//XML
+-->
+
+<!ENTITY alpha	"&#x03B1;"> <!--  -->
+<!ENTITY beta	"&#x03B2;"> <!-- GREEK SMALL LETTER BETA -->
+<!ENTITY gamma	"&#x03B3;"> <!-- GREEK SMALL LETTER GAMMA -->
+<!ENTITY Gamma	"&#x0393;"> <!-- GREEK CAPITAL LETTER GAMMA -->
+<!ENTITY gammad	"&#x03DC;"> <!-- GREEK LETTER DIGAMMA -->
+<!ENTITY delta	"&#x03B4;"> <!-- GREEK SMALL LETTER DELTA -->
+<!ENTITY Delta	"&#x0394;"> <!-- GREEK CAPITAL LETTER DELTA -->
+<!ENTITY epsi	"&#x220A;"> <!--  -->
+<!ENTITY epsiv	"&#x03B5;"> <!--  -->
+<!ENTITY epsis	"&#x220A;"> <!--  -->
+<!ENTITY zeta	"&#x03B6;"> <!-- GREEK SMALL LETTER ZETA -->
+<!ENTITY eta	"&#x03B7;"> <!-- GREEK SMALL LETTER ETA -->
+<!ENTITY thetas	"&#x03B8;"> <!--  -->
+<!ENTITY Theta	"&#x0398;"> <!-- GREEK CAPITAL LETTER THETA -->
+<!ENTITY thetav	"&#x03D1;"> <!--  -->
+<!ENTITY iota	"&#x03B9;"> <!-- GREEK SMALL LETTER IOTA -->
+<!ENTITY kappa	"&#x03BA;"> <!-- GREEK SMALL LETTER KAPPA -->
+<!ENTITY kappav	"&#x03F0;"> <!-- GREEK KAPPA SYMBOL -->
+<!ENTITY lambda	"&#x03BB;"> <!-- GREEK SMALL LETTER LAMDA -->
+<!ENTITY Lambda	"&#x039B;"> <!-- GREEK CAPITAL LETTER LAMDA -->
+<!ENTITY mu	"&#x03BC;"> <!-- GREEK SMALL LETTER MU -->
+<!ENTITY nu	"&#x03BD;"> <!-- GREEK SMALL LETTER NU -->
+<!ENTITY xi	"&#x03BE;"> <!-- GREEK SMALL LETTER XI -->
+<!ENTITY Xi	"&#x039E;"> <!-- GREEK CAPITAL LETTER XI -->
+<!ENTITY pi	"&#x03C0;"> <!-- GREEK SMALL LETTER PI -->
+<!ENTITY piv	"&#x03D6;"> <!-- GREEK PI SYMBOL -->
+<!ENTITY Pi	"&#x03A0;"> <!-- GREEK CAPITAL LETTER PI -->
+<!ENTITY rho	"&#x03C1;"> <!-- GREEK SMALL LETTER RHO -->
+<!ENTITY rhov	"&#x03F1;"> <!-- GREEK RHO SYMBOL -->
+<!ENTITY sigma	"&#x03C3;"> <!-- GREEK SMALL LETTER SIGMA -->
+<!ENTITY Sigma	"&#x03A3;"> <!-- GREEK CAPITAL LETTER SIGMA -->
+<!ENTITY sigmav	"&#x03C2;"> <!--  -->
+<!ENTITY tau	"&#x03C4;"> <!-- GREEK SMALL LETTER TAU -->
+<!ENTITY upsi	"&#x03C5;"> <!-- GREEK SMALL LETTER UPSILON -->
+<!ENTITY Upsi	"&#x03D2;"> <!--  -->
+<!ENTITY phis	"&#x03C6;"> <!-- GREEK SMALL LETTER PHI -->
+<!ENTITY Phi	"&#x03A6;"> <!-- GREEK CAPITAL LETTER PHI -->
+<!ENTITY phiv	"&#x03D5;"> <!-- GREEK PHI SYMBOL -->
+<!ENTITY chi	"&#x03C7;"> <!-- GREEK SMALL LETTER CHI -->
+<!ENTITY psi	"&#x03C8;"> <!-- GREEK SMALL LETTER PSI -->
+<!ENTITY Psi	"&#x03A8;"> <!-- GREEK CAPITAL LETTER PSI -->
+<!ENTITY omega	"&#x03C9;"> <!-- GREEK SMALL LETTER OMEGA -->
+<!ENTITY Omega	"&#x03A9;"> <!-- GREEK CAPITAL LETTER OMEGA -->
+
+<!-- End of ISO Greek Symbols Entities V0.3 ............................... -->
+<!-- ...................................................................... -->
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk4.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk4.ent
new file mode 100644
index 0000000..18c96eb
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk4.ent
@@ -0,0 +1,85 @@
+<!-- ...................................................................... -->
+<!-- ISO Alternative Greek Symbols Entities V0.3 .......................... -->
+<!-- File iso-grk4.ent .................................................... -->
+
+<!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
+     Information Standards (OASIS).
+
+     $Id: iso-grk4.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $
+
+     Permission to use, copy, modify and distribute this entity set
+     and its accompanying documentation for any purpose and without
+     fee is hereby granted in perpetuity, provided that the above
+     copyright notice and this paragraph appear in all copies. The
+     copyright holders make no representation about the suitability of
+     the entities for any purpose. It is provided "as is" without
+     expressed or implied warranty.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+
+     Derived, in part, from:
+
+       * iso-grk4.gml
+
+           Copyright (C) 1986 International Organization for Standardization
+           Permission to copy in any form is granted for use with
+           conforming SGML systems and applications as defined in
+           ISO 8879, provided this notice is included in all copies.
+
+       * http://www.tug.org/applications/jadetex/unicode.xml
+
+       * ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT
+
+     Please use the following formal public identifier to identify it:
+
+       ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML
+-->
+
+<!ENTITY b.alpha	"&#x03B1;"> <!--  -->
+<!ENTITY b.beta	"&#x03B2;"> <!-- GREEK SMALL LETTER BETA -->
+<!ENTITY b.gamma	"&#x03B3;"> <!-- GREEK SMALL LETTER GAMMA -->
+<!ENTITY b.Gamma	"&#x0393;"> <!-- GREEK CAPITAL LETTER GAMMA -->
+<!ENTITY b.gammad	"&#x03DC;"> <!-- GREEK LETTER DIGAMMA -->
+<!ENTITY b.delta	"&#x03B4;"> <!-- GREEK SMALL LETTER DELTA -->
+<!ENTITY b.Delta	"&#x0394;"> <!-- GREEK CAPITAL LETTER DELTA -->
+<!ENTITY b.epsi	"&#x03B5;"> <!--  -->
+<!ENTITY b.epsiv	"&#x03B5;"> <!--  -->
+<!ENTITY b.epsis	"&#x03B5;"> <!--  -->
+<!ENTITY b.zeta	"&#x03B6;"> <!-- GREEK SMALL LETTER ZETA -->
+<!ENTITY b.eta	"&#x03B7;"> <!-- GREEK SMALL LETTER ETA -->
+<!ENTITY b.thetas	"&#x03B8;"> <!--  -->
+<!ENTITY b.Theta	"&#x0398;"> <!-- GREEK CAPITAL LETTER THETA -->
+<!ENTITY b.thetav	"&#x03D1;"> <!--  -->
+<!ENTITY b.iota	"&#x03B9;"> <!-- GREEK SMALL LETTER IOTA -->
+<!ENTITY b.kappa	"&#x03BA;"> <!-- GREEK SMALL LETTER KAPPA -->
+<!ENTITY b.kappav	"&#x03F0;"> <!-- GREEK KAPPA SYMBOL -->
+<!ENTITY b.lambda	"&#x03BB;"> <!-- GREEK SMALL LETTER LAMDA -->
+<!ENTITY b.Lambda	"&#x039B;"> <!-- GREEK CAPITAL LETTER LAMDA -->
+<!ENTITY b.mu	"&#x03BC;"> <!-- GREEK SMALL LETTER MU -->
+<!ENTITY b.nu	"&#x03BD;"> <!-- GREEK SMALL LETTER NU -->
+<!ENTITY b.xi	"&#x03BE;"> <!-- GREEK SMALL LETTER XI -->
+<!ENTITY b.Xi	"&#x039E;"> <!-- GREEK CAPITAL LETTER XI -->
+<!ENTITY b.pi	"&#x03C0;"> <!-- GREEK SMALL LETTER PI -->
+<!ENTITY b.Pi	"&#x03A0;"> <!-- GREEK CAPITAL LETTER PI -->
+<!ENTITY b.piv	"&#x03D6;"> <!-- GREEK PI SYMBOL -->
+<!ENTITY b.rho	"&#x03C1;"> <!-- GREEK SMALL LETTER RHO -->
+<!ENTITY b.rhov	"&#x03F1;"> <!-- GREEK RHO SYMBOL -->
+<!ENTITY b.sigma	"&#x03C3;"> <!-- GREEK SMALL LETTER SIGMA -->
+<!ENTITY b.Sigma	"&#x03A3;"> <!-- GREEK CAPITAL LETTER SIGMA -->
+<!ENTITY b.sigmav	"&#x03C2;"> <!--  -->
+<!ENTITY b.tau	"&#x03C4;"> <!-- GREEK SMALL LETTER TAU -->
+<!ENTITY b.upsi	"&#x03C5;"> <!-- GREEK SMALL LETTER UPSILON -->
+<!ENTITY b.Upsi	"&#x03D2;"> <!--  -->
+<!ENTITY b.phis	"&#x03C6;"> <!-- GREEK SMALL LETTER PHI -->
+<!ENTITY b.Phi	"&#x03A6;"> <!-- GREEK CAPITAL LETTER PHI -->
+<!ENTITY b.phiv	"&#x03D5;"> <!-- GREEK PHI SYMBOL -->
+<!ENTITY b.chi	"&#x03C7;"> <!-- GREEK SMALL LETTER CHI -->
+<!ENTITY b.psi	"&#x03C8;"> <!-- GREEK SMALL LETTER PSI -->
+<!ENTITY b.Psi	"&#x03A8;"> <!-- GREEK CAPITAL LETTER PSI -->
+<!ENTITY b.omega	"&#x03C9;"> <!-- GREEK SMALL LETTER OMEGA -->
+<!ENTITY b.Omega	"&#x03A9;"> <!-- GREEK CAPITAL LETTER OMEGA -->
+
+<!-- End of ISO Alternative Greek Symbols Entities V0.3 ................... -->
+<!-- ...................................................................... -->
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat1.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat1.ent
new file mode 100644
index 0000000..9c2c249
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat1.ent
@@ -0,0 +1,104 @@
+<!-- ...................................................................... -->
+<!-- ISO Added Latin 1 Entities V0.3 ...................................... -->
+<!-- File iso-lat1.ent .................................................... -->
+
+<!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
+     Information Standards (OASIS).
+
+     $Id: iso-lat1.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $
+
+     Permission to use, copy, modify and distribute this entity set
+     and its accompanying documentation for any purpose and without
+     fee is hereby granted in perpetuity, provided that the above
+     copyright notice and this paragraph appear in all copies. The
+     copyright holders make no representation about the suitability of
+     the entities for any purpose. It is provided "as is" without
+     expressed or implied warranty.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+
+     Derived, in part, from:
+
+       * iso-lat1.gml
+
+           Copyright (C) 1986 International Organization for Standardization
+           Permission to copy in any form is granted for use with
+           conforming SGML systems and applications as defined in
+           ISO 8879, provided this notice is included in all copies.
+
+       * http://www.tug.org/applications/jadetex/unicode.xml
+
+       * ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT
+
+     Please use the following formal public identifier to identify it:
+
+       ISO 8879:1986//ENTITIES Added Latin 1//EN//XML
+-->
+
+<!ENTITY aacute	"&#x00E1;"> <!-- LATIN SMALL LETTER A WITH ACUTE -->
+<!ENTITY Aacute	"&#x00C1;"> <!-- LATIN CAPITAL LETTER A WITH ACUTE -->
+<!ENTITY acirc	"&#x00E2;"> <!-- LATIN SMALL LETTER A WITH CIRCUMFLEX -->
+<!ENTITY Acirc	"&#x00C2;"> <!-- LATIN CAPITAL LETTER A WITH CIRCUMFLEX -->
+<!ENTITY agrave	"&#x00E0;"> <!-- LATIN SMALL LETTER A WITH GRAVE -->
+<!ENTITY Agrave	"&#x00C0;"> <!-- LATIN CAPITAL LETTER A WITH GRAVE -->
+<!ENTITY aring	"&#x00E5;"> <!-- LATIN SMALL LETTER A WITH RING ABOVE -->
+<!ENTITY Aring	"&#x00C5;"> <!-- LATIN CAPITAL LETTER A WITH RING ABOVE -->
+<!ENTITY atilde	"&#x00E3;"> <!-- LATIN SMALL LETTER A WITH TILDE -->
+<!ENTITY Atilde	"&#x00C3;"> <!-- LATIN CAPITAL LETTER A WITH TILDE -->
+<!ENTITY auml	"&#x00E4;"> <!-- LATIN SMALL LETTER A WITH DIAERESIS -->
+<!ENTITY Auml	"&#x00C4;"> <!-- LATIN CAPITAL LETTER A WITH DIAERESIS -->
+<!ENTITY aelig	"&#x00E6;"> <!-- LATIN SMALL LETTER AE -->
+<!ENTITY AElig	"&#x00C6;"> <!-- LATIN CAPITAL LETTER AE -->
+<!ENTITY ccedil	"&#x00E7;"> <!-- LATIN SMALL LETTER C WITH CEDILLA -->
+<!ENTITY Ccedil	"&#x00C7;"> <!-- LATIN CAPITAL LETTER C WITH CEDILLA -->
+<!ENTITY eth	"&#x00F0;"> <!-- LATIN SMALL LETTER ETH -->
+<!ENTITY ETH	"&#x00D0;"> <!-- LATIN CAPITAL LETTER ETH -->
+<!ENTITY eacute	"&#x00E9;"> <!-- LATIN SMALL LETTER E WITH ACUTE -->
+<!ENTITY Eacute	"&#x00C9;"> <!-- LATIN CAPITAL LETTER E WITH ACUTE -->
+<!ENTITY ecirc	"&#x00EA;"> <!-- LATIN SMALL LETTER E WITH CIRCUMFLEX -->
+<!ENTITY Ecirc	"&#x00CA;"> <!-- LATIN CAPITAL LETTER E WITH CIRCUMFLEX -->
+<!ENTITY egrave	"&#x00E8;"> <!-- LATIN SMALL LETTER E WITH GRAVE -->
+<!ENTITY Egrave	"&#x00C8;"> <!-- LATIN CAPITAL LETTER E WITH GRAVE -->
+<!ENTITY euml	"&#x00EB;"> <!-- LATIN SMALL LETTER E WITH DIAERESIS -->
+<!ENTITY Euml	"&#x00CB;"> <!-- LATIN CAPITAL LETTER E WITH DIAERESIS -->
+<!ENTITY iacute	"&#x00ED;"> <!-- LATIN SMALL LETTER I WITH ACUTE -->
+<!ENTITY Iacute	"&#x00CD;"> <!-- LATIN CAPITAL LETTER I WITH ACUTE -->
+<!ENTITY icirc	"&#x00EE;"> <!-- LATIN SMALL LETTER I WITH CIRCUMFLEX -->
+<!ENTITY Icirc	"&#x00CE;"> <!-- LATIN CAPITAL LETTER I WITH CIRCUMFLEX -->
+<!ENTITY igrave	"&#x00EC;"> <!-- LATIN SMALL LETTER I WITH GRAVE -->
+<!ENTITY Igrave	"&#x00CC;"> <!-- LATIN CAPITAL LETTER I WITH GRAVE -->
+<!ENTITY iuml	"&#x00EF;"> <!-- LATIN SMALL LETTER I WITH DIAERESIS -->
+<!ENTITY Iuml	"&#x00CF;"> <!-- LATIN CAPITAL LETTER I WITH DIAERESIS -->
+<!ENTITY ntilde	"&#x00F1;"> <!-- LATIN SMALL LETTER N WITH TILDE -->
+<!ENTITY Ntilde	"&#x00D1;"> <!-- LATIN CAPITAL LETTER N WITH TILDE -->
+<!ENTITY oacute	"&#x00F3;"> <!-- LATIN SMALL LETTER O WITH ACUTE -->
+<!ENTITY Oacute	"&#x00D3;"> <!-- LATIN CAPITAL LETTER O WITH ACUTE -->
+<!ENTITY ocirc	"&#x00F4;"> <!-- LATIN SMALL LETTER O WITH CIRCUMFLEX -->
+<!ENTITY Ocirc	"&#x00D4;"> <!-- LATIN CAPITAL LETTER O WITH CIRCUMFLEX -->
+<!ENTITY ograve	"&#x00F2;"> <!-- LATIN SMALL LETTER O WITH GRAVE -->
+<!ENTITY Ograve	"&#x00D2;"> <!-- LATIN CAPITAL LETTER O WITH GRAVE -->
+<!ENTITY oslash	"&#x00F8;"> <!-- LATIN SMALL LETTER O WITH STROKE -->
+<!ENTITY Oslash	"&#x00D8;"> <!-- LATIN CAPITAL LETTER O WITH STROKE -->
+<!ENTITY otilde	"&#x00F5;"> <!-- LATIN SMALL LETTER O WITH TILDE -->
+<!ENTITY Otilde	"&#x00D5;"> <!-- LATIN CAPITAL LETTER O WITH TILDE -->
+<!ENTITY ouml	"&#x00F6;"> <!-- LATIN SMALL LETTER O WITH DIAERESIS -->
+<!ENTITY Ouml	"&#x00D6;"> <!-- LATIN CAPITAL LETTER O WITH DIAERESIS -->
+<!ENTITY szlig	"&#x00DF;"> <!-- LATIN SMALL LETTER SHARP S -->
+<!ENTITY thorn	"&#x00FE;"> <!-- LATIN SMALL LETTER THORN -->
+<!ENTITY THORN	"&#x00DE;"> <!-- LATIN CAPITAL LETTER THORN -->
+<!ENTITY uacute	"&#x00FA;"> <!-- LATIN SMALL LETTER U WITH ACUTE -->
+<!ENTITY Uacute	"&#x00DA;"> <!-- LATIN CAPITAL LETTER U WITH ACUTE -->
+<!ENTITY ucirc	"&#x00FB;"> <!-- LATIN SMALL LETTER U WITH CIRCUMFLEX -->
+<!ENTITY Ucirc	"&#x00DB;"> <!-- LATIN CAPITAL LETTER U WITH CIRCUMFLEX -->
+<!ENTITY ugrave	"&#x00F9;"> <!-- LATIN SMALL LETTER U WITH GRAVE -->
+<!ENTITY Ugrave	"&#x00D9;"> <!-- LATIN CAPITAL LETTER U WITH GRAVE -->
+<!ENTITY uuml	"&#x00FC;"> <!-- LATIN SMALL LETTER U WITH DIAERESIS -->
+<!ENTITY Uuml	"&#x00DC;"> <!-- LATIN CAPITAL LETTER U WITH DIAERESIS -->
+<!ENTITY yacute	"&#x00FD;"> <!-- LATIN SMALL LETTER Y WITH ACUTE -->
+<!ENTITY Yacute	"&#x00DD;"> <!-- LATIN CAPITAL LETTER Y WITH ACUTE -->
+<!ENTITY yuml	"&#x00FF;"> <!-- LATIN SMALL LETTER Y WITH DIAERESIS -->
+
+<!-- End of ISO Added Latin 1 Entities V0.3 ............................... -->
+<!-- ...................................................................... -->
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat2.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat2.ent
new file mode 100644
index 0000000..2f14696
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat2.ent
@@ -0,0 +1,163 @@
+<!-- ...................................................................... -->
+<!-- ISO Added Latin 2 Entities V0.3 ...................................... -->
+<!-- File iso-lat2.ent .................................................... -->
+
+<!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
+     Information Standards (OASIS).
+
+     $Id: iso-lat2.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $
+
+     Permission to use, copy, modify and distribute this entity set
+     and its accompanying documentation for any purpose and without
+     fee is hereby granted in perpetuity, provided that the above
+     copyright notice and this paragraph appear in all copies. The
+     copyright holders make no representation about the suitability of
+     the entities for any purpose. It is provided "as is" without
+     expressed or implied warranty.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+
+     Derived, in part, from:
+
+       * iso-lat2.gml
+
+           Copyright (C) 1986 International Organization for Standardization
+           Permission to copy in any form is granted for use with
+           conforming SGML systems and applications as defined in
+           ISO 8879, provided this notice is included in all copies.
+
+       * http://www.tug.org/applications/jadetex/unicode.xml
+
+       * ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT
+
+     Please use the following formal public identifier to identify it:
+
+       ISO 8879:1986//ENTITIES Added Latin 2//EN//XML
+-->
+
+<!ENTITY abreve	"&#x0103;"> <!-- LATIN SMALL LETTER A WITH BREVE -->
+<!ENTITY Abreve	"&#x0102;"> <!-- LATIN CAPITAL LETTER A WITH BREVE -->
+<!ENTITY amacr	"&#x0101;"> <!-- LATIN SMALL LETTER A WITH MACRON -->
+<!ENTITY Amacr	"&#x0100;"> <!-- LATIN CAPITAL LETTER A WITH MACRON -->
+<!ENTITY aogon	"&#x0105;"> <!-- LATIN SMALL LETTER A WITH OGONEK -->
+<!ENTITY Aogon	"&#x0104;"> <!-- LATIN CAPITAL LETTER A WITH OGONEK -->
+<!ENTITY cacute	"&#x0107;"> <!-- LATIN SMALL LETTER C WITH ACUTE -->
+<!ENTITY Cacute	"&#x0106;"> <!-- LATIN CAPITAL LETTER C WITH ACUTE -->
+<!ENTITY ccaron	"&#x010D;"> <!-- LATIN SMALL LETTER C WITH CARON -->
+<!ENTITY Ccaron	"&#x010C;"> <!-- LATIN CAPITAL LETTER C WITH CARON -->
+<!ENTITY ccirc	"&#x0109;"> <!-- LATIN SMALL LETTER C WITH CIRCUMFLEX -->
+<!ENTITY Ccirc	"&#x0108;"> <!-- LATIN CAPITAL LETTER C WITH CIRCUMFLEX -->
+<!ENTITY cdot	"&#x010B;"> <!-- LATIN SMALL LETTER C WITH DOT ABOVE -->
+<!ENTITY Cdot	"&#x010A;"> <!-- LATIN CAPITAL LETTER C WITH DOT ABOVE -->
+<!ENTITY dcaron	"&#x010F;"> <!-- LATIN SMALL LETTER D WITH CARON -->
+<!ENTITY Dcaron	"&#x010E;"> <!-- LATIN CAPITAL LETTER D WITH CARON -->
+<!ENTITY dstrok	"&#x0111;"> <!-- LATIN SMALL LETTER D WITH STROKE -->
+<!ENTITY Dstrok	"&#x0110;"> <!-- LATIN CAPITAL LETTER D WITH STROKE -->
+<!ENTITY ecaron	"&#x011B;"> <!-- LATIN SMALL LETTER E WITH CARON -->
+<!ENTITY Ecaron	"&#x011A;"> <!-- LATIN CAPITAL LETTER E WITH CARON -->
+<!ENTITY edot	"&#x0117;"> <!-- LATIN SMALL LETTER E WITH DOT ABOVE -->
+<!ENTITY Edot	"&#x0116;"> <!-- LATIN CAPITAL LETTER E WITH DOT ABOVE -->
+<!ENTITY emacr	"&#x0113;"> <!-- LATIN SMALL LETTER E WITH MACRON -->
+<!ENTITY Emacr	"&#x0112;"> <!-- LATIN CAPITAL LETTER E WITH MACRON -->
+<!ENTITY eogon	"&#x0119;"> <!-- LATIN SMALL LETTER E WITH OGONEK -->
+<!ENTITY Eogon	"&#x0118;"> <!-- LATIN CAPITAL LETTER E WITH OGONEK -->
+<!ENTITY gacute	"&#x01F5;"> <!-- LATIN SMALL LETTER G WITH ACUTE -->
+<!ENTITY gbreve	"&#x011F;"> <!-- LATIN SMALL LETTER G WITH BREVE -->
+<!ENTITY Gbreve	"&#x011E;"> <!-- LATIN CAPITAL LETTER G WITH BREVE -->
+<!ENTITY Gcedil	"&#x0122;"> <!-- LATIN CAPITAL LETTER G WITH CEDILLA -->
+<!ENTITY gcirc	"&#x011D;"> <!-- LATIN SMALL LETTER G WITH CIRCUMFLEX -->
+<!ENTITY Gcirc	"&#x011C;"> <!-- LATIN CAPITAL LETTER G WITH CIRCUMFLEX -->
+<!ENTITY gdot	"&#x0121;"> <!-- LATIN SMALL LETTER G WITH DOT ABOVE -->
+<!ENTITY Gdot	"&#x0120;"> <!-- LATIN CAPITAL LETTER G WITH DOT ABOVE -->
+<!ENTITY hcirc	"&#x0125;"> <!-- LATIN SMALL LETTER H WITH CIRCUMFLEX -->
+<!ENTITY Hcirc	"&#x0124;"> <!-- LATIN CAPITAL LETTER H WITH CIRCUMFLEX -->
+<!ENTITY hstrok	"&#x0127;"> <!-- LATIN SMALL LETTER H WITH STROKE -->
+<!ENTITY Hstrok	"&#x0126;"> <!-- LATIN CAPITAL LETTER H WITH STROKE -->
+<!ENTITY Idot	"&#x0130;"> <!-- LATIN CAPITAL LETTER I WITH DOT ABOVE -->
+<!ENTITY Imacr	"&#x012A;"> <!-- LATIN CAPITAL LETTER I WITH MACRON -->
+<!ENTITY imacr	"&#x012B;"> <!-- LATIN SMALL LETTER I WITH MACRON -->
+<!ENTITY ijlig	"&#x0133;"> <!-- LATIN SMALL LIGATURE IJ -->
+<!ENTITY IJlig	"&#x0132;"> <!-- LATIN CAPITAL LIGATURE IJ -->
+<!ENTITY inodot	"&#x0131;"> <!-- LATIN SMALL LETTER DOTLESS I -->
+<!ENTITY iogon	"&#x012F;"> <!-- LATIN SMALL LETTER I WITH OGONEK -->
+<!ENTITY Iogon	"&#x012E;"> <!-- LATIN CAPITAL LETTER I WITH OGONEK -->
+<!ENTITY itilde	"&#x0129;"> <!-- LATIN SMALL LETTER I WITH TILDE -->
+<!ENTITY Itilde	"&#x0128;"> <!-- LATIN CAPITAL LETTER I WITH TILDE -->
+<!ENTITY jcirc	"&#x0135;"> <!-- LATIN SMALL LETTER J WITH CIRCUMFLEX -->
+<!ENTITY Jcirc	"&#x0134;"> <!-- LATIN CAPITAL LETTER J WITH CIRCUMFLEX -->
+<!ENTITY kcedil	"&#x0137;"> <!-- LATIN SMALL LETTER K WITH CEDILLA -->
+<!ENTITY Kcedil	"&#x0136;"> <!-- LATIN CAPITAL LETTER K WITH CEDILLA -->
+<!ENTITY kgreen	"&#x0138;"> <!-- LATIN SMALL LETTER KRA -->
+<!ENTITY lacute	"&#x013A;"> <!-- LATIN SMALL LETTER L WITH ACUTE -->
+<!ENTITY Lacute	"&#x0139;"> <!-- LATIN CAPITAL LETTER L WITH ACUTE -->
+<!ENTITY lcaron	"&#x013E;"> <!-- LATIN SMALL LETTER L WITH CARON -->
+<!ENTITY Lcaron	"&#x013D;"> <!-- LATIN CAPITAL LETTER L WITH CARON -->
+<!ENTITY lcedil	"&#x013C;"> <!-- LATIN SMALL LETTER L WITH CEDILLA -->
+<!ENTITY Lcedil	"&#x013B;"> <!-- LATIN CAPITAL LETTER L WITH CEDILLA -->
+<!ENTITY lmidot	"&#x0140;"> <!-- LATIN SMALL LETTER L WITH MIDDLE DOT -->
+<!ENTITY Lmidot	"&#x013F;"> <!-- LATIN CAPITAL LETTER L WITH MIDDLE DOT -->
+<!ENTITY lstrok	"&#x0142;"> <!-- LATIN SMALL LETTER L WITH STROKE -->
+<!ENTITY Lstrok	"&#x0141;"> <!-- LATIN CAPITAL LETTER L WITH STROKE -->
+<!ENTITY nacute	"&#x0144;"> <!-- LATIN SMALL LETTER N WITH ACUTE -->
+<!ENTITY Nacute	"&#x0143;"> <!-- LATIN CAPITAL LETTER N WITH ACUTE -->
+<!ENTITY eng	"&#x014B;"> <!-- LATIN SMALL LETTER ENG -->
+<!ENTITY ENG	"&#x014A;"> <!-- LATIN CAPITAL LETTER ENG -->
+<!ENTITY napos	"&#x0149;"> <!-- LATIN SMALL LETTER N PRECEDED BY APOSTROPHE -->
+<!ENTITY ncaron	"&#x0148;"> <!-- LATIN SMALL LETTER N WITH CARON -->
+<!ENTITY Ncaron	"&#x0147;"> <!-- LATIN CAPITAL LETTER N WITH CARON -->
+<!ENTITY ncedil	"&#x0146;"> <!-- LATIN SMALL LETTER N WITH CEDILLA -->
+<!ENTITY Ncedil	"&#x0145;"> <!-- LATIN CAPITAL LETTER N WITH CEDILLA -->
+<!ENTITY odblac	"&#x0151;"> <!-- LATIN SMALL LETTER O WITH DOUBLE ACUTE -->
+<!ENTITY Odblac	"&#x0150;"> <!-- LATIN CAPITAL LETTER O WITH DOUBLE ACUTE -->
+<!ENTITY Omacr	"&#x014C;"> <!-- LATIN CAPITAL LETTER O WITH MACRON -->
+<!ENTITY omacr	"&#x014D;"> <!-- LATIN SMALL LETTER O WITH MACRON -->
+<!ENTITY oelig	"&#x0153;"> <!-- LATIN SMALL LIGATURE OE -->
+<!ENTITY OElig	"&#x0152;"> <!-- LATIN CAPITAL LIGATURE OE -->
+<!ENTITY racute	"&#x0155;"> <!-- LATIN SMALL LETTER R WITH ACUTE -->
+<!ENTITY Racute	"&#x0154;"> <!-- LATIN CAPITAL LETTER R WITH ACUTE -->
+<!ENTITY rcaron	"&#x0159;"> <!-- LATIN SMALL LETTER R WITH CARON -->
+<!ENTITY Rcaron	"&#x0158;"> <!-- LATIN CAPITAL LETTER R WITH CARON -->
+<!ENTITY rcedil	"&#x0157;"> <!-- LATIN SMALL LETTER R WITH CEDILLA -->
+<!ENTITY Rcedil	"&#x0156;"> <!-- LATIN CAPITAL LETTER R WITH CEDILLA -->
+<!ENTITY sacute	"&#x015B;"> <!-- LATIN SMALL LETTER S WITH ACUTE -->
+<!ENTITY Sacute	"&#x015A;"> <!-- LATIN CAPITAL LETTER S WITH ACUTE -->
+<!ENTITY scaron	"&#x0161;"> <!-- LATIN SMALL LETTER S WITH CARON -->
+<!ENTITY Scaron	"&#x0160;"> <!-- LATIN CAPITAL LETTER S WITH CARON -->
+<!ENTITY scedil	"&#x015F;"> <!-- LATIN SMALL LETTER S WITH CEDILLA -->
+<!ENTITY Scedil	"&#x015E;"> <!-- LATIN CAPITAL LETTER S WITH CEDILLA -->
+<!ENTITY scirc	"&#x015D;"> <!-- LATIN SMALL LETTER S WITH CIRCUMFLEX -->
+<!ENTITY Scirc	"&#x015C;"> <!-- LATIN CAPITAL LETTER S WITH CIRCUMFLEX -->
+<!ENTITY tcaron	"&#x0165;"> <!-- LATIN SMALL LETTER T WITH CARON -->
+<!ENTITY Tcaron	"&#x0164;"> <!-- LATIN CAPITAL LETTER T WITH CARON -->
+<!ENTITY tcedil	"&#x0163;"> <!-- LATIN SMALL LETTER T WITH CEDILLA -->
+<!ENTITY Tcedil	"&#x0162;"> <!-- LATIN CAPITAL LETTER T WITH CEDILLA -->
+<!ENTITY tstrok	"&#x0167;"> <!-- LATIN SMALL LETTER T WITH STROKE -->
+<!ENTITY Tstrok	"&#x0166;"> <!-- LATIN CAPITAL LETTER T WITH STROKE -->
+<!ENTITY ubreve	"&#x016D;"> <!-- LATIN SMALL LETTER U WITH BREVE -->
+<!ENTITY Ubreve	"&#x016C;"> <!-- LATIN CAPITAL LETTER U WITH BREVE -->
+<!ENTITY udblac	"&#x0171;"> <!-- LATIN SMALL LETTER U WITH DOUBLE ACUTE -->
+<!ENTITY Udblac	"&#x0170;"> <!-- LATIN CAPITAL LETTER U WITH DOUBLE ACUTE -->
+<!ENTITY umacr	"&#x016B;"> <!-- LATIN SMALL LETTER U WITH MACRON -->
+<!ENTITY Umacr	"&#x016A;"> <!-- LATIN CAPITAL LETTER U WITH MACRON -->
+<!ENTITY uogon	"&#x0173;"> <!-- LATIN SMALL LETTER U WITH OGONEK -->
+<!ENTITY Uogon	"&#x0172;"> <!-- LATIN CAPITAL LETTER U WITH OGONEK -->
+<!ENTITY uring	"&#x016F;"> <!-- LATIN SMALL LETTER U WITH RING ABOVE -->
+<!ENTITY Uring	"&#x016E;"> <!-- LATIN CAPITAL LETTER U WITH RING ABOVE -->
+<!ENTITY utilde	"&#x0169;"> <!-- LATIN SMALL LETTER U WITH TILDE -->
+<!ENTITY Utilde	"&#x0168;"> <!-- LATIN CAPITAL LETTER U WITH TILDE -->
+<!ENTITY wcirc	"&#x0175;"> <!-- LATIN SMALL LETTER W WITH CIRCUMFLEX -->
+<!ENTITY Wcirc	"&#x0174;"> <!-- LATIN CAPITAL LETTER W WITH CIRCUMFLEX -->
+<!ENTITY ycirc	"&#x0177;"> <!-- LATIN SMALL LETTER Y WITH CIRCUMFLEX -->
+<!ENTITY Ycirc	"&#x0176;"> <!-- LATIN CAPITAL LETTER Y WITH CIRCUMFLEX -->
+<!ENTITY Yuml	"&#x0178;"> <!-- LATIN CAPITAL LETTER Y WITH DIAERESIS -->
+<!ENTITY zacute	"&#x017A;"> <!-- LATIN SMALL LETTER Z WITH ACUTE -->
+<!ENTITY Zacute	"&#x0179;"> <!-- LATIN CAPITAL LETTER Z WITH ACUTE -->
+<!ENTITY zcaron	"&#x017E;"> <!-- LATIN SMALL LETTER Z WITH CARON -->
+<!ENTITY Zcaron	"&#x017D;"> <!-- LATIN CAPITAL LETTER Z WITH CARON -->
+<!ENTITY zdot	"&#x017C;"> <!-- LATIN SMALL LETTER Z WITH DOT ABOVE -->
+<!ENTITY Zdot	"&#x017B;"> <!-- LATIN CAPITAL LETTER Z WITH DOT ABOVE -->
+
+<!-- End of ISO Added Latin 2 Entities V0.3 ............................... -->
+<!-- ...................................................................... -->
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-num.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-num.ent
new file mode 100644
index 0000000..b3c434e
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-num.ent
@@ -0,0 +1,118 @@
+<!-- ...................................................................... -->
+<!-- ISO Numeric and Special Graphic Entities V0.3 ........................ -->
+<!-- File iso-num.ent ..................................................... -->
+
+<!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
+     Information Standards (OASIS).
+
+     $Id: iso-num.ent,v 1.1 2008/05/27 19:26:07 jsumali Exp $
+
+     Permission to use, copy, modify and distribute this entity set
+     and its accompanying documentation for any purpose and without
+     fee is hereby granted in perpetuity, provided that the above
+     copyright notice and this paragraph appear in all copies. The
+     copyright holders make no representation about the suitability of
+     the entities for any purpose. It is provided "as is" without
+     expressed or implied warranty.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+
+     Derived, in part, from:
+
+       * iso-num.gml
+
+           Copyright (C) 1986 International Organization for Standardization
+           Permission to copy in any form is granted for use with
+           conforming SGML systems and applications as defined in
+           ISO 8879, provided this notice is included in all copies.
+
+       * http://www.tug.org/applications/jadetex/unicode.xml
+
+       * ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT
+
+     Please use the following formal public identifier to identify it:
+
+       ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML
+-->
+
+<!ENTITY half	"&#x00BD;"> <!-- VULGAR FRACTION ONE HALF -->
+<!ENTITY frac12	"&#x00BD;"> <!-- VULGAR FRACTION ONE HALF -->
+<!ENTITY frac14	"&#x00BC;"> <!-- VULGAR FRACTION ONE QUARTER -->
+<!ENTITY frac34	"&#x00BE;"> <!-- VULGAR FRACTION THREE QUARTERS -->
+<!ENTITY frac18	"&#x215B;"> <!--  -->
+<!ENTITY frac38	"&#x215C;"> <!--  -->
+<!ENTITY frac58	"&#x215D;"> <!--  -->
+<!ENTITY frac78	"&#x215E;"> <!--  -->
+<!ENTITY sup1	"&#x00B9;"> <!-- SUPERSCRIPT ONE -->
+<!ENTITY sup2	"&#x00B2;"> <!-- SUPERSCRIPT TWO -->
+<!ENTITY sup3	"&#x00B3;"> <!-- SUPERSCRIPT THREE -->
+<!ENTITY plus	"&#x002B;"> <!-- PLUS SIGN -->
+<!ENTITY plusmn	"&#x00B1;"> <!-- PLUS-MINUS SIGN -->
+<!ENTITY lt	"&#38;#60;"> <!-- LESS-THAN SIGN -->
+<!ENTITY equals	"&#x003D;"> <!-- EQUALS SIGN -->
+<!ENTITY gt	"&#x003E;"> <!-- GREATER-THAN SIGN -->
+<!ENTITY divide	"&#x00F7;"> <!-- DIVISION SIGN -->
+<!ENTITY times	"&#x00D7;"> <!-- MULTIPLICATION SIGN -->
+<!ENTITY curren	"&#x00A4;"> <!-- CURRENCY SIGN -->
+<!ENTITY pound	"&#x00A3;"> <!-- POUND SIGN -->
+<!ENTITY dollar	"&#x0024;"> <!-- DOLLAR SIGN -->
+<!ENTITY cent	"&#x00A2;"> <!-- CENT SIGN -->
+<!ENTITY yen	"&#x00A5;"> <!-- YEN SIGN -->
+<!ENTITY num	"&#x0023;"> <!-- NUMBER SIGN -->
+<!ENTITY percnt	"&#x0025;"> <!-- PERCENT SIGN -->
+<!ENTITY amp	"&#38;#38;"> <!-- AMPERSAND -->
+<!ENTITY ast	"&#x002A;"> <!-- ASTERISK -->
+<!ENTITY commat	"&#x0040;"> <!-- COMMERCIAL AT -->
+<!ENTITY lsqb	"&#x005B;"> <!-- LEFT SQUARE BRACKET -->
+<!ENTITY bsol	"&#x005C;"> <!-- REVERSE SOLIDUS -->
+<!ENTITY rsqb	"&#x005D;"> <!-- RIGHT SQUARE BRACKET -->
+<!ENTITY lcub	"&#x007B;"> <!-- LEFT CURLY BRACKET -->
+<!ENTITY horbar	"&#x2015;"> <!-- HORIZONTAL BAR -->
+<!ENTITY verbar	"&#x007C;"> <!-- VERTICAL LINE -->
+<!ENTITY rcub	"&#x007D;"> <!-- RIGHT CURLY BRACKET -->
+<!ENTITY micro	"&#x00B5;"> <!-- MICRO SIGN -->
+<!ENTITY ohm	"&#x2126;"> <!-- OHM SIGN -->
+<!ENTITY deg	"&#x00B0;"> <!-- DEGREE SIGN -->
+<!ENTITY ordm	"&#x00BA;"> <!-- MASCULINE ORDINAL INDICATOR -->
+<!ENTITY ordf	"&#x00AA;"> <!-- FEMININE ORDINAL INDICATOR -->
+<!ENTITY sect	"&#x00A7;"> <!-- SECTION SIGN -->
+<!ENTITY para	"&#x00B6;"> <!-- PILCROW SIGN -->
+<!ENTITY middot	"&#x00B7;"> <!-- MIDDLE DOT -->
+<!ENTITY larr	"&#x2190;"> <!-- LEFTWARDS ARROW -->
+<!ENTITY rarr	"&#x2192;"> <!-- RIGHTWARDS ARROW -->
+<!ENTITY uarr	"&#x2191;"> <!-- UPWARDS ARROW -->
+<!ENTITY darr	"&#x2193;"> <!-- DOWNWARDS ARROW -->
+<!ENTITY copy	"&#x00A9;"> <!-- COPYRIGHT SIGN -->
+<!ENTITY reg	"&#x00AE;"> <!-- REG TRADE MARK SIGN -->
+<!ENTITY trade	"&#x2122;"> <!-- TRADE MARK SIGN -->
+<!ENTITY brvbar	"&#x00A6;"> <!-- BROKEN BAR -->
+<!ENTITY not	"&#x00AC;"> <!-- NOT SIGN -->
+<!ENTITY sung	"&#x2669;"> <!--  -->
+<!ENTITY excl	"&#x0021;"> <!-- EXCLAMATION MARK -->
+<!ENTITY iexcl	"&#x00A1;"> <!-- INVERTED EXCLAMATION MARK -->
+<!ENTITY quot	"&#x0022;"> <!-- QUOTATION MARK -->
+<!ENTITY apos	"&#x0027;"> <!-- APOSTROPHE -->
+<!ENTITY lpar	"&#x0028;"> <!-- LEFT PARENTHESIS -->
+<!ENTITY rpar	"&#x0029;"> <!-- RIGHT PARENTHESIS -->
+<!ENTITY comma	"&#x002C;"> <!-- COMMA -->
+<!ENTITY lowbar	"&#x005F;"> <!-- LOW LINE -->
+<!ENTITY hyphen	"&#x002D;"> <!-- HYPHEN-MINUS -->
+<!ENTITY period	"&#x002E;"> <!-- FULL STOP -->
+<!ENTITY sol	"&#x002F;"> <!-- SOLIDUS -->
+<!ENTITY colon	"&#x003A;"> <!-- COLON -->
+<!ENTITY semi	"&#x003B;"> <!-- SEMICOLON -->
+<!ENTITY quest	"&#x003F;"> <!-- QUESTION MARK -->
+<!ENTITY iquest	"&#x00BF;"> <!-- INVERTED QUESTION MARK -->
+<!ENTITY laquo	"&#x00AB;"> <!-- LEFT-POINTING DOUBLE ANGLE QUOTATION MARK -->
+<!ENTITY raquo	"&#x00BB;"> <!-- RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
+<!ENTITY lsquo	"&#x2018;"> <!--  -->
+<!ENTITY rsquo	"&#x2019;"> <!-- RIGHT SINGLE QUOTATION MARK -->
+<!ENTITY ldquo	"&#x201C;"> <!--  -->
+<!ENTITY rdquo	"&#x201D;"> <!-- RIGHT DOUBLE QUOTATION MARK -->
+<!ENTITY nbsp	"&#x00A0;"> <!-- NO-BREAK SPACE -->
+<!ENTITY shy	"&#x00AD;"> <!-- SOFT HYPHEN -->
+
+<!-- End of ISO Numeric and Special Graphic Entities V0.3 ................. -->
+<!-- ...................................................................... -->
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-pub.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-pub.ent
new file mode 100644
index 0000000..979d178
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-pub.ent
@@ -0,0 +1,127 @@
+<!-- ...................................................................... -->
+<!-- ISO Publishing Entities V0.3 ......................................... -->
+<!-- File iso-pub.ent ..................................................... -->
+
+<!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
+     Information Standards (OASIS).
+
+     $Id: iso-pub.ent,v 1.1 2008/05/27 19:26:08 jsumali Exp $
+
+     Permission to use, copy, modify and distribute this entity set
+     and its accompanying documentation for any purpose and without
+     fee is hereby granted in perpetuity, provided that the above
+     copyright notice and this paragraph appear in all copies. The
+     copyright holders make no representation about the suitability of
+     the entities for any purpose. It is provided "as is" without
+     expressed or implied warranty.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+
+     Derived, in part, from:
+
+       * iso-pub.gml
+
+           Copyright (C) 1986 International Organization for Standardization
+           Permission to copy in any form is granted for use with
+           conforming SGML systems and applications as defined in
+           ISO 8879, provided this notice is included in all copies.
+
+       * http://www.tug.org/applications/jadetex/unicode.xml
+
+       * ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT
+
+     Please use the following formal public identifier to identify it:
+
+       ISO 8879:1986//ENTITIES Publishing//EN//XML
+-->
+
+<!ENTITY emsp	"&#x2003;"> <!-- EM SPACE -->
+<!ENTITY ensp	"&#x2002;"> <!-- EN SPACE -->
+<!ENTITY emsp13	"&#x2004;"> <!-- THREE-PER-EM SPACE -->
+<!ENTITY emsp14	"&#x2005;"> <!-- FOUR-PER-EM SPACE -->
+<!ENTITY numsp	"&#x2007;"> <!-- FIGURE SPACE -->
+<!ENTITY puncsp	"&#x2008;"> <!-- PUNCTUATION SPACE -->
+<!ENTITY thinsp	"&#x2009;"> <!-- THIN SPACE -->
+<!ENTITY hairsp	"&#x200A;"> <!-- HAIR SPACE -->
+<!ENTITY mdash	"&#x2014;"> <!-- EM DASH -->
+<!ENTITY ndash	"&#x2013;"> <!-- EN DASH -->
+<!ENTITY dash	"&#x2010;"> <!-- HYPHEN -->
+<!ENTITY blank	"&#x2423;"> <!-- OPEN BOX -->
+<!ENTITY hellip	"&#x2026;"> <!-- HORIZONTAL ELLIPSIS -->
+<!ENTITY nldr	"&#x2025;"> <!-- TWO DOT LEADER -->
+<!ENTITY frac13	"&#x2153;"> <!-- VULGAR FRACTION ONE THIRD -->
+<!ENTITY frac23	"&#x2154;"> <!-- VULGAR FRACTION TWO THIRDS -->
+<!ENTITY frac15	"&#x2155;"> <!-- VULGAR FRACTION ONE FIFTH -->
+<!ENTITY frac25	"&#x2156;"> <!-- VULGAR FRACTION TWO FIFTHS -->
+<!ENTITY frac35	"&#x2157;"> <!-- VULGAR FRACTION THREE FIFTHS -->
+<!ENTITY frac45	"&#x2158;"> <!-- VULGAR FRACTION FOUR FIFTHS -->
+<!ENTITY frac16	"&#x2159;"> <!-- VULGAR FRACTION ONE SIXTH -->
+<!ENTITY frac56	"&#x215A;"> <!-- VULGAR FRACTION FIVE SIXTHS -->
+<!ENTITY incare	"&#x2105;"> <!-- CARE OF -->
+<!ENTITY block	"&#x2588;"> <!-- FULL BLOCK -->
+<!ENTITY uhblk	"&#x2580;"> <!-- UPPER HALF BLOCK -->
+<!ENTITY lhblk	"&#x2584;"> <!-- LOWER HALF BLOCK -->
+<!ENTITY blk14	"&#x2591;"> <!-- LIGHT SHADE -->
+<!ENTITY blk12	"&#x2592;"> <!-- MEDIUM SHADE -->
+<!ENTITY blk34	"&#x2593;"> <!-- DARK SHADE -->
+<!ENTITY marker	"&#x25AE;"> <!-- BLACK VERTICAL RECTANGLE -->
+<!ENTITY cir	"&#x25CB;"> <!-- WHITE CIRCLE -->
+<!ENTITY squ	"&#x25A1;"> <!-- WHITE SQUARE -->
+<!ENTITY rect	"&#x25AD;"> <!-- WHITE RECTANGLE -->
+<!ENTITY utri	"&#x25B5;"> <!-- WHITE UP-POINTING TRIANGLE -->
+<!ENTITY dtri	"&#x25BF;"> <!-- WHITE DOWN-POINTING TRIANGLE -->
+<!ENTITY star	"&#x22C6;"> <!-- STAR OPERATOR -->
+<!ENTITY bull	"&#x2022;"> <!-- BULLET -->
+<!ENTITY squf	"&#x25AA;"> <!--  -->
+<!ENTITY utrif	"&#x25B4;"> <!-- BLACK UP-POINTING TRIANGLE -->
+<!ENTITY dtrif	"&#x25BE;"> <!-- BLACK DOWN-POINTING TRIANGLE -->
+<!ENTITY ltrif	"&#x25C2;"> <!-- BLACK LEFT-POINTING TRIANGLE -->
+<!ENTITY rtrif	"&#x25B8;"> <!-- BLACK RIGHT-POINTING TRIANGLE -->
+<!ENTITY clubs	"&#x2663;"> <!-- BLACK CLUB SUIT -->
+<!ENTITY diams	"&#x2666;"> <!-- BLACK DIAMOND SUIT -->
+<!ENTITY hearts	"&#x2665;"> <!-- BLACK HEART SUIT -->
+<!ENTITY spades	"&#x2660;"> <!-- BLACK SPADE SUIT -->
+<!ENTITY malt	"&#x2720;"> <!-- MALTESE CROSS -->
+<!ENTITY dagger	"&#x2020;"> <!-- DAGGER -->
+<!ENTITY Dagger	"&#x2021;"> <!-- DOUBLE DAGGER -->
+<!ENTITY check	"&#x2713;"> <!-- CHECK MARK -->
+<!ENTITY cross	"&#x2717;"> <!-- BALLOT X -->
+<!ENTITY sharp	"&#x266F;"> <!-- MUSIC SHARP SIGN -->
+<!ENTITY flat	"&#x266D;"> <!-- MUSIC FLAT SIGN -->
+<!ENTITY male	"&#x2642;"> <!-- MALE SIGN -->
+<!ENTITY female	"&#x2640;"> <!--  -->
+<!ENTITY phone	"&#x260E;"> <!-- TELEPHONE SIGN -->
+<!ENTITY telrec	"&#x2315;"> <!-- TELEPHONE RECORDER -->
+<!ENTITY copysr	"&#x2117;"> <!-- SOUND RECORDING COPYRIGHT -->
+<!ENTITY caret	"&#x2041;"> <!-- CARET -->
+<!ENTITY lsquor	"&#x201A;"> <!-- SINGLE LOW-9 QUOTATION MARK -->
+<!ENTITY ldquor	"&#x201E;"> <!-- DOUBLE LOW-9 QUOTATION MARK -->
+<!ENTITY fflig	"&#xFB00;"> <!--  -->
+<!ENTITY filig	"&#xFB01;"> <!--  -->
+<!--     fjlig	Unknown unicode character -->
+<!ENTITY ffilig	"&#xFB03;"> <!--  -->
+<!ENTITY ffllig	"&#xFB04;"> <!--  -->
+<!ENTITY fllig	"&#xFB02;"> <!--  -->
+<!ENTITY mldr	"&#x2026;"> <!-- HORIZONTAL ELLIPSIS -->
+<!ENTITY rdquor	"&#x201C;"> <!--  -->
+<!ENTITY rsquor	"&#x2018;"> <!--  -->
+<!ENTITY vellip	"&#x22EE;"> <!--  -->
+<!ENTITY hybull	"&#x2043;"> <!-- HYPHEN BULLET -->
+<!ENTITY loz	"&#x25CA;"> <!-- LOZENGE -->
+<!ENTITY lozf	"&#x2726;"> <!--  -->
+<!ENTITY ltri	"&#x25C3;"> <!-- WHITE LEFT-POINTING TRIANGLE -->
+<!ENTITY rtri	"&#x25B9;"> <!-- WHITE RIGHT-POINTING TRIANGLE -->
+<!ENTITY starf	"&#x2605;"> <!-- BLACK STAR -->
+<!ENTITY natur	"&#x266E;"> <!-- MUSIC NATURAL SIGN -->
+<!ENTITY rx	"&#x211E;"> <!-- PRESCRIPTION TAKE -->
+<!ENTITY sext	"&#x2736;"> <!-- SIX POINTED BLACK STAR -->
+<!ENTITY target	"&#x2316;"> <!-- POSITION INDICATOR -->
+<!ENTITY dlcrop	"&#x230D;"> <!-- BOTTOM LEFT CROP -->
+<!ENTITY drcrop	"&#x230C;"> <!-- BOTTOM RIGHT CROP -->
+<!ENTITY ulcrop	"&#x230F;"> <!-- TOP LEFT CROP -->
+<!ENTITY urcrop	"&#x230E;"> <!-- TOP RIGHT CROP -->
+
+<!-- End of ISO Publishing Entities V0.3 .................................. -->
+<!-- ...................................................................... -->
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-tech.ent b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-tech.ent
new file mode 100644
index 0000000..b0aaac4
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-tech.ent
@@ -0,0 +1,104 @@
+<!-- ...................................................................... -->
+<!-- ISO General Technical Entities V0.3 .................................. -->
+<!-- File iso-tech.ent .................................................... -->
+
+<!-- Copyright (C) 2001, 2002 Organization for the Advancement of Structured
+     Information Standards (OASIS).
+
+     $Id: iso-tech.ent,v 1.1 2008/05/27 19:26:08 jsumali Exp $
+
+     Permission to use, copy, modify and distribute this entity set
+     and its accompanying documentation for any purpose and without
+     fee is hereby granted in perpetuity, provided that the above
+     copyright notice and this paragraph appear in all copies. The
+     copyright holders make no representation about the suitability of
+     the entities for any purpose. It is provided "as is" without
+     expressed or implied warranty.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+
+     Derived, in part, from:
+
+       * iso-tech.gml
+
+           Copyright (C) 1986 International Organization for Standardization
+           Permission to copy in any form is granted for use with
+           conforming SGML systems and applications as defined in
+           ISO 8879, provided this notice is included in all copies.
+
+       * http://www.tug.org/applications/jadetex/unicode.xml
+
+       * ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/SGML.TXT
+
+     Please use the following formal public identifier to identify it:
+
+       ISO 8879:1986//ENTITIES General Technical//EN//XML
+-->
+
+<!ENTITY aleph	"&#x2135;"> <!-- ALEF SYMBOL -->
+<!ENTITY and	"&#x2227;"> <!--  -->
+<!ENTITY ang90	"&#x221F;"> <!-- RIGHT ANGLE -->
+<!ENTITY angsph	"&#x2222;"> <!--  -->
+<!ENTITY ap	"&#x2248;"> <!--  -->
+<!ENTITY becaus	"&#x2235;"> <!-- BECAUSE -->
+<!ENTITY bottom	"&#x22A5;"> <!--  -->
+<!ENTITY cap	"&#x2229;"> <!--  -->
+<!ENTITY cong	"&#x2245;"> <!--  -->
+<!ENTITY conint	"&#x222E;"> <!--  -->
+<!ENTITY cup	"&#x222A;"> <!--  -->
+<!ENTITY equiv	"&#x2261;"> <!--  -->
+<!ENTITY exist	"&#x2203;"> <!--  -->
+<!ENTITY forall	"&#x2200;"> <!--  -->
+<!ENTITY fnof	"&#x0192;"> <!-- LATIN SMALL LETTER F WITH HOOK -->
+<!ENTITY ge	"&#x2265;"> <!-- GREATER-THAN OR EQUAL TO -->
+<!ENTITY iff	"&#x21D4;"> <!-- LEFT RIGHT DOUBLE ARROW -->
+<!ENTITY infin	"&#x221E;"> <!--  -->
+<!ENTITY int	"&#x222B;"> <!--  -->
+<!ENTITY isin	"&#x220A;"> <!--  -->
+<!ENTITY lang	"&#x3008;"> <!--  -->
+<!ENTITY lArr	"&#x21D0;"> <!-- LEFTWARDS ARROW -->
+<!ENTITY le	"&#x2264;"> <!--  -->
+<!ENTITY minus	"&#x2212;"> <!-- MINUS SIGN -->
+<!ENTITY mnplus	"&#x2213;"> <!--  -->
+<!ENTITY nabla	"&#x2207;"> <!-- NABLA -->
+<!ENTITY ne	"&#x2260;"> <!--  -->
+<!ENTITY ni	"&#x220D;"> <!--  -->
+<!ENTITY or	"&#x2228;"> <!--  -->
+<!ENTITY par	"&#x2225;"> <!-- PARALLEL TO -->
+<!ENTITY part	"&#x2202;"> <!--  -->
+<!ENTITY permil	"&#x2030;"> <!-- PER MILLE SIGN -->
+<!ENTITY perp	"&#x22A5;"> <!--  -->
+<!ENTITY prime	"&#x2032;"> <!-- PRIME -->
+<!ENTITY Prime	"&#x2033;"> <!-- DOUBLE PRIME -->
+<!ENTITY prop	"&#x221D;"> <!--  -->
+<!ENTITY radic	"&#x221A;"> <!--  -->
+<!ENTITY rang	"&#x3009;"> <!--  -->
+<!ENTITY rArr	"&#x21D2;"> <!-- RIGHTWARDS ARROW -->
+<!ENTITY sim	"&#x223C;"> <!--  -->
+<!ENTITY sime	"&#x2243;"> <!--  -->
+<!ENTITY square	"&#x25A1;"> <!-- WHITE SQUARE -->
+<!ENTITY sub	"&#x2282;"> <!--  -->
+<!ENTITY sube	"&#x2286;"> <!--  -->
+<!ENTITY sup	"&#x2283;"> <!--  -->
+<!ENTITY supe	"&#x2287;"> <!--  -->
+<!ENTITY there4	"&#x2234;"> <!--  -->
+<!ENTITY Verbar	"&#x2016;"> <!-- DOUBLE VERTICAL LINE -->
+<!ENTITY angst	"&#x212B;"> <!-- ANGSTROM SIGN -->
+<!ENTITY bernou	"&#x212C;"> <!-- SCRIPT CAPITAL B -->
+<!ENTITY compfn	"&#x2218;"> <!-- RING OPERATOR -->
+<!ENTITY Dot	"&#x00A8;"> <!--  -->
+<!ENTITY DotDot	"&#x20DC;"> <!-- COMBINING FOUR DOTS ABOVE -->
+<!ENTITY hamilt	"&#x210B;"> <!-- SCRIPT CAPITAL H -->
+<!ENTITY lagran	"&#x2112;"> <!-- SCRIPT CAPITAL L -->
+<!ENTITY lowast	"&#x2217;"> <!-- ASTERISK OPERATOR -->
+<!ENTITY notin	"&#x2209;"> <!--  -->
+<!ENTITY order	"&#x2134;"> <!-- SCRIPT SMALL O -->
+<!ENTITY phmmat	"&#x2133;"> <!-- SCRIPT CAPITAL M -->
+<!ENTITY tdot	"&#x20DB;"> <!-- COMBINING THREE DOTS ABOVE -->
+<!ENTITY tprime	"&#x2034;"> <!-- TRIPLE PRIME -->
+<!ENTITY wedgeq	"&#x2259;"> <!-- ESTIMATES -->
+
+<!-- End of ISO General Technical Entities V0.3 ........................... -->
+<!-- ...................................................................... -->
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/gjdoc-alphaindex.dtd b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/gjdoc-alphaindex.dtd
new file mode 100644
index 0000000..5597d7b
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/gjdoc-alphaindex.dtd
@@ -0,0 +1,35 @@
+<!-- gjdoc-alphabetical.dtd
+     Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA. -->
+
+<!-- 
+  NOTE: This is NOT a complete DTD usable for verifying XML files
+  generated by XmlDoclet. This file is currently only used to include
+  OASIS' standard entity sets.
+-->
+
+<!ENTITY % dbcent.module "INCLUDE">
+<![%dbcent.module;[
+<!ENTITY euro "&#x20AC;">  <!-- Euro sign, U+20AC -->
+<!ENTITY % dbcent PUBLIC 
+"-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN"
+"dbcentx.mod">
+%dbcent;
+]]>
+
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/gjdoc.dtd b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/gjdoc.dtd
new file mode 100644
index 0000000..6d02bd8
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/dtd/gjdoc.dtd
@@ -0,0 +1,35 @@
+<!-- gjdoc.dtd
+     Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA. -->
+
+<!-- 
+  NOTE: This is NOT a complete DTD usable for verifying XML files
+  generated by XmlDoclet. This file is currently only used to include
+  OASIS' standard entity sets.
+-->
+
+<!ENTITY % dbcent.module "INCLUDE">
+<![%dbcent.module;[
+<!ENTITY euro "&#x20AC;">  <!-- Euro sign, U+20AC -->
+<!ENTITY % dbcent PUBLIC 
+"-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN"
+"dbcentx.mod">
+%dbcent;
+]]>
+
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/HtmlDoclet.properties b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/HtmlDoclet.properties
new file mode 100644
index 0000000..37ffad4
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/HtmlDoclet.properties
@@ -0,0 +1,32 @@
+# gjdochtml-vanilla.css
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Classpath.
+# 
+# GNU Classpath is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#  
+# GNU Classpath is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Classpath; see the file COPYING.  If not, write to the
+# Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+#
+# Defines localized strings for HtmlDoclet (US-english/fallback)
+#
+
+usagetype.class-derived-from = Classes derived from {0}
+usagetype.class-implementing = Classes implementing {0}
+usagetype.field-of-type = Fields of type {0}
+usagetype.method-with-return-type = Methods with return type {0}
+usagetype.method-with-parameter-type = Methods with parameter type {0}
+usagetype.method-with-thrown-type = Methods which throw type {0}
+usagetype.constructor-with-parameter-type = Constructors with parameter type {0}
+usagetype.constructor-with-thrown-type = Constructors which throw type {0}
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/gjdoc.js b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/gjdoc.js
new file mode 100644
index 0000000..91f8ba2
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/gjdoc.js
@@ -0,0 +1,115 @@
+/* gjdoc.js
+ Copyright (C) 2004 Free Software Foundation, Inc.
+
+ This file is part of GNU Classpath.
+
+ GNU Classpath is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+ 
+ GNU Classpath is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNU Classpath; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+/**
+ *  Sets a new stylesheet for a single frame.
+ */
+function setStyleSheetForFrame(title, frame_name)
+{
+   var i, num, a, main;
+   f = eval("top.frames." + frame_name);
+   for(i=0; (a = f.document.getElementsByTagName("link")[i]); i++) {
+      if(a.getAttribute("rel").indexOf("style") != -1
+         && a.getAttribute("title")) {
+         a.disabled = true;
+         a.disabled = (a.getAttribute("title") != title);
+      }
+   }
+}
+
+/**
+ *  Sets a new stylesheet for a single document.
+ */
+function setStyleSheetForDocument(title) 
+{
+   var i, num, a, main;
+   for(i=0; (a = top.document.getElementsByTagName("link")[i]); i++) {
+      if(a.getAttribute("rel").indexOf("style") != -1
+         && a.getAttribute("title")) {
+         a.disabled = true;
+         a.disabled = (a.getAttribute("title") != title);        
+      }
+   }
+}
+
+/**
+ *  Sets a new stylesheets for all frames.
+ */
+function setStyleSheet(title)
+{
+   var i, num, a, main;
+   num = top.frames.length;
+   if (num > 0) {
+      for (i=0; i<num; i++) {
+         setStyleSheetForFrame(title, top.frames[i].name);
+      }
+   }
+   else {
+      setStyleSheetForDocument(title);
+   }
+   top.selectedSheet = title;
+   return false;
+}
+
+/**
+ *  Returns the title of the set of stylesheets that is active in the
+ *  given frame.
+ */
+function getActiveStylesheetTitle(frame)
+{ 
+   for(i=0; (a = frame.document.getElementsByTagName("link")[i]); i++) {
+      if(a.getAttribute("rel").indexOf("style") != -1
+         && a.getAttribute("title")) {
+         if (!a.disabled) {
+            return a.getAttribute("title");
+         }    
+      }
+   }
+   return "";
+}
+
+/**
+ *  Invoked when a page in the main content frame has been loaded.
+ */
+function contentPageLoaded(title) 
+{ 
+   if (title) {
+      top.document.title = title;
+   }
+   /** 20050204: removed since there is only one stylesheet at the time
+   if (top.frames.length > 0) {
+      setStyleSheet(getActiveStylesheetTitle(top.frames.packages), "content");
+   }
+   else if (top.selectedSheet) { 
+      setStyleSheet(top.selectedSheet, "content");
+   }
+   **/
+}
+
+/**
+ *  Invoked when a page in one of the two frames on the left hand has
+ *  been loaded.
+ */
+function secondaryPageLoaded(frame_name)
+{ 
+   /** 20050204: removed since there is only one stylesheet at the time
+   setStyleSheet(getActiveStylesheetTitle(top.frames.packages), frame_name);
+   **/
+}
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/gjdochtml-clean-color1.css b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/gjdochtml-clean-color1.css
new file mode 100644
index 0000000..28452fa
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/gjdochtml-clean-color1.css
@@ -0,0 +1,80 @@
+/* gjdochtml-clean-layout.css
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA. */
+
+/* --- GNU Clean Style: Color Scheme #1 --- */
+
+[class~="title"],
+[class="table header"],
+[class="table sub header"],
+[class="section header"],
+[class="serialized package header"],
+[class="serialized class header"]
+{
+        background-color: #E8EAFF;
+}
+
+[class~="navbar"][class~="item"]
+{
+         border-color: #000000;
+         color: #000000;
+}
+
+[class~="navbar"][class~="item"][class~="disabled"]
+{
+         border-color: #aaaaaa;
+         color: #aaaaaa;
+}
+
+[class~="navbar"][class~="item"][class~="active"]
+{
+        color: #000000;
+        background-color: #E8EAFF;
+}
+
+[class~="navbar"][class~="item"][class~="active"]
+{
+        border-color:  #222222;
+}
+
+.navbar .header a
+{
+        color: #777777;
+}
+
+a[href] {
+  color: #141EB8;
+}
+
+a[href]:visited {
+  color: #0C126E;
+}
+
+
+/* ---- source highlighting ---- */
+
+.comment      { color: #777777; }
+.tag          { color: #444444; }
+.keyword      { color: #B36B00; }
+.header.type  { color: #00248F; }
+.type         { color: #0033CC; }
+.literal      { color: #809FFF; }
+.variable     { color: #007D48; }
+.method       { color: #B32400; }
+.line-number  { color: #AAAAAA; }
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/gjdochtml-clean-layout.css b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/gjdochtml-clean-layout.css
new file mode 100644
index 0000000..9d45909
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/gjdochtml-clean-layout.css
@@ -0,0 +1,460 @@
+/* gjdochtml-clean-layout.css
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA. */
+
+/* --- GNU Clean Style: Layout --- */
+
+body
+{
+        background: white;
+        color: black;
+}
+
+body.content
+{
+        margin-left: 1.3em;        
+        margin-right: 1.3em;        
+        margin-top: 0.9em;        
+        margin-bottom: 1.3em;        
+}
+
+div[class="class title outer"]
+{
+        margin: 0em;
+        margin-bottom: 1em;
+        border: 1px solid;
+        padding: 10pt;
+}
+
+[class="class title-package"]
+{
+        margin: 0em;
+        padding: 0em;
+}
+
+[class="class title-class"]
+{
+        margin: 0em;
+        margin-top: 0.2em;
+        padding: 0em;
+}
+
+[class="table header"],
+[class="table sub header"]
+{
+        margin: 0em;
+        padding: 0.25em;
+}
+
+[class="section header"]
+{
+        margin: 0em;
+        padding: 0.25em;
+        border: 1px solid;
+}
+
+.serialized.package.header
+{
+        margin: 0em;
+        padding: 0.25em;
+        border: 1px solid;
+        margin-bottom: 1em;
+}
+
+
+.serialized.class.header
+{
+        margin: 0em;
+        padding: 0.25em;
+        padding-left: 3.25em;
+        border: 1px solid;
+        text-indent: -3em;
+        font-weight: normal;
+        font-size: 1.2em;
+}
+
+.serialized.section.header
+{
+        font-size: 1.15em;
+}
+
+div.serialized.section
+{
+        padding-left: 1em;
+}
+
+.summary td,
+.summary .inherited
+{
+        padding: 0.25em;
+}
+
+table[border]
+{
+        border-spacing: 0em;
+        border-collapse: collapse;
+}
+
+table[border] td
+{
+        border-spacing: 0em;
+        border-collapse: collapse;
+}
+
+hr
+{
+        border-top: 1px solid;
+        border-bottom: 0px;
+        border-left: 0px;
+        border-right: 0px;
+}
+
+.class.summary .left
+{
+        width: 10%;
+}
+
+.class.summary td.left
+{
+        text-align: right;
+}
+
+.class.summary .left .synopsis
+{
+        font-size: small;
+}
+
+
+[class="package summary left"]
+{
+        width: 20%;
+}
+
+ul.inheritance
+{       
+        margin-left: 1.8em;
+        padding-left: 0em;
+        marker-offset: 0em !important;
+        list-style-type: none;
+        list-style-image: none;
+}
+
+li.inheritance
+{
+        margin: 0em !important;
+        margin-top: 0.1em !important;
+        padding: 0em !important;
+        marker-offset: 0em !important;
+}
+
+ul.inheritance > li.inheritance:before
+{
+        display: marker;
+        width: 12px;
+        margin: 0em !important;
+        padding: 0em !important;
+        marker-offset: 0em !important;
+        content: url(inherit.png);
+        vertical-align: center !important;
+}
+
+[class="inheritance 0"] > li.inheritance:before
+{
+        display: none;
+}
+
+ul [class="inheritance 0"]
+{
+        margin-left: 12px !important;
+        padding-left: 0em;
+        list-style-type: none !important;
+        list-style-image: none !important;
+}
+
+.inheritance-tree
+{
+        position: relative;
+        left: -24px;
+}
+
+.synopsis.outer
+{
+        padding: 0em;
+        margin-bottom: 0.3em;
+}
+
+.synopsis.outer > *
+{
+        margin: 0em;
+        padding: 0em;
+        line-height: 1.0em;
+}
+
+div.navbar.div
+{
+        padding: 0em;
+        margin: 0em;
+        position: relative;
+        left: -0.2em;
+}
+
+.navbar.div,
+.navbar.div tr,
+.navbar.div td
+{
+        margin: 0em;
+        padding: 0em;
+        border-spacing: 0em;
+        border-collapse: collapse;
+}
+
+table.navbar.div
+{
+        width: 100%;
+}
+
+table.navbar.div td
+{
+        line-height: 1.9em;
+        text-align: top;
+}
+
+.navbar.item
+{
+        /* float: left; */
+        border: 1px solid;
+        /* width: 7.5em; */
+        text-align: center;
+        margin: 0.05em;
+        padding-top: 0.2em;
+        padding-bottom: 0.3em;
+        padding-left: 0.5em;
+        padding-right: 0.5em;
+        font-size: 0.75em;
+        margin-bottom: 0.5em;
+}
+
+.navbar.item.active
+{
+        /* font-weight: bold; */
+        border: 1px solid;
+}
+
+[class~="title"]
+{
+        border: 1px solid;
+        padding: 0.3em;
+        margin-top: 0em;
+}
+
+.table.container,
+.table.container dd
+{
+        padding: 0em;
+        margin: 0em;
+}
+
+.overview.summary
+{
+        padding: 0em;
+        margin: 0em;
+}
+
+.summary
+{
+        margin-bottom: 1.2em;
+}
+        
+table.navbar.top
+{
+        margin-bottom: 1em !important;
+}
+
+.package.description
+{
+        margin-top: 0.0em;
+        margin-bottom: 1.0em;
+}
+
+.class.description
+{
+        margin-top: 1em;
+        margin-bottom: 0.8em;
+}
+
+[class="overview description top"]
+{
+        margin-top: 0.0em;
+        margin-bottom: 1.0em;
+}
+
+[class="overview description full"]
+{
+        margin-top: 1.0em;
+        margin-bottom: 0.0em;
+}
+
+.class.summary .right .list
+{
+        margin: 0em;
+        padding: 0em;  
+}
+
+.class.summary .right .list .synopsis
+{
+        margin: 0em;
+        padding: 0em;         
+}
+
+.classes .menu-subtitle
+{
+        padding: 0em;
+        margin-top: 0.5em;
+        margin-bottom: 0em;
+}
+
+.menu-title
+{
+        padding: 0em;
+        margin-top: 0.8em;
+        margin-bottom: 0.2em;
+}
+
+.menu-entry
+{
+        font-size: 0.8em;
+}
+
+.class.summary .right
+{
+        vertical-align: top;
+}
+
+.class.summary .right .list
+{
+        vertical-align: top;
+}
+
+.navi
+{
+        padding-top: 0.5em;
+        font-size: x-small;
+}
+
+.navbar .header
+{
+        vertical-align: top;
+}
+
+.navbar .header span
+{
+        border: none;
+        white-space: nowrap;
+        padding-top: 0.2em;
+        padding-bottom: 0.3em;
+        padding-left: 0.5em;
+}
+
+.navbar .header a
+{
+        font-weight: bold;
+        font-size: 11pt;
+}
+
+h1
+{
+        font-size: 1.5em;
+}
+
+h2
+{
+        font-size: 1.3em;
+}
+
+h3
+{
+        font-size: 1.1em;
+}
+
+.summary .right .synopsis
+{
+        padding-left: 5.25em !important;
+        text-indent: -5em !important;
+}
+
+.summary .right .description
+{
+        text-indent: 1em !important;
+        padding-top: 0.25em !important;
+        padding-bottom: 0.1em !important;
+        padding-left: 0.25em !important;
+}
+
+td.usage.summary
+{
+        vertical-align: top;
+}
+
+.index .entry .description
+{
+        padding-left: 3em;
+}
+
+.index .entry .key
+{
+        padding-left: 5.25em;
+        text-indent: -5em;
+}
+
+.dep-list .summary .description
+{
+        padding-top: 0.1em;
+        padding-left: 3em;
+}
+
+.dep-toc .header
+{
+        padding-bottom: 0em;
+        margin-bottom: 0.2em;
+}
+
+.dep-toc .list
+{
+        margin-top: 0em;
+        margin-bottom: 1.5em;
+        padding-top: 0em;
+        padding-bottom: 0em;
+        padding-left: 2em;
+}
+
+ul.tree li.node
+{
+        list-style-type: disc;
+}
+
+ul.tree ul
+{
+        margin-left: 0em;
+        padding-left: 1.8em;
+}
+
+li.level
+{
+        list-style-type: none;
+}
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/gjdochtml-vanilla.css b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/gjdochtml-vanilla.css
new file mode 100644
index 0000000..503207b
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/gjdochtml-vanilla.css
@@ -0,0 +1,21 @@
+/* gjdochtml-vanilla.css
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA. */
+
+/* Empty Vanilla Stylesheeet */
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/help.xhtml b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/help.xhtml
new file mode 100644
index 0000000..e1bb453
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/help.xhtml
@@ -0,0 +1,25 @@
+<!-- help.xhtml
+     Copyright (C) 2004 Free Software Foundation, Inc.
+     
+     This file is part of GNU Classpath.
+     
+     GNU Classpath is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+      
+     GNU Classpath is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+     
+     You should have received a copy of the GNU General Public License
+     along with GNU Classpath; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     02111-1307 USA.
+     -->
+
+<p>
+  Sorry, no help available.
+</p>
+
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/inherit.png b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/inherit.png
new file mode 100644
index 0000000..50ca474
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/inherit.png
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/xhtml11-target10.dtd b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/xhtml11-target10.dtd
new file mode 100644
index 0000000..0dd73f7
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/xhtml11-target10.dtd
@@ -0,0 +1,54 @@
+<!-- xhtml11-strict-target10.dtd
+     Copyright (C) 2005 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA. -->
+
+<!-- XHTML 1.1 plus Target 1.0 DTD  ................................ -->
+
+<!-- File: xhtml11-target10.dtd
+
+   XHTML 1.1 DTD which loads the optional Target 1.0 Module.
+
+   This file is based on a DTD by Jacques Distler. See
+   http://golem.ph.utexas.edu/~distler/blog/files/zeldman.html
+
+   Public and System Identifiers:
+
+        PUBLIC "-//gnu.org//DTD XHTML 1.1 plus Target 1.0//EN"
+        SYSTEM "http://gnu.org/DTD/xhtml11-target10.dtd"
+
+    The corresponding DOCTYPE declaration:
+
+        <!DOCTYPE html
+            PUBLIC "-//gnu.org//DTD XHTML 1.1 plus Target 1.0//EN"
+            "http://gnu.org/DTD/xhtml11-target10.dtd">
+
+    Original idea: Dave H <dmh@dmh.org.uk>
+                   http://www.dmh.org.uk/
+
+-->
+<!ENTITY % XHTML.version
+    "-//gnu.org//DTD XHTML 1.1 plus Target 1.0//EN" >
+<!ENTITY % xhtml11.mod
+    PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" >
+%xhtml11.mod;
+<!ENTITY % xhtml-target.mod
+    PUBLIC "-//W3C//ELEMENTS XHTML Target 1.0//EN"
+    "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-target-1.mod" >
+%xhtml-target.mod;
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/java.lang-classes-1.2.txt b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/java.lang-classes-1.2.txt
new file mode 100644
index 0000000..0e44adf
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/java.lang-classes-1.2.txt
@@ -0,0 +1,78 @@
+Cloneable
+Comparable
+Runnable
+Boolean
+Byte
+Character
+Character.Subset
+Character.UnicodeBlock
+Class
+ClassLoader
+Compiler
+Double
+Float
+InheritableThreadLocal
+Integer
+Long
+Math
+Number
+Object
+Package
+Process
+Runtime
+RuntimePermission
+SecurityManager
+Short
+String
+StringBuffer
+System
+Thread
+ThreadGroup
+ThreadLocal
+Throwable
+Void
+ArithmeticException
+ArrayIndexOutOfBoundsException
+ArrayStoreException
+ClassCastException
+ClassNotFoundException
+CloneNotSupportedException
+Exception
+IllegalAccessException
+IllegalArgumentException
+IllegalMonitorStateException
+IllegalStateException
+IllegalThreadStateException
+IndexOutOfBoundsException
+InstantiationException
+InterruptedException
+NegativeArraySizeException
+NoSuchFieldException
+NoSuchMethodException
+NullPointerException
+NumberFormatException
+RuntimeException
+SecurityException
+StringIndexOutOfBoundsException
+UnsupportedOperationException
+AbstractMethodError
+ClassCircularityError
+ClassFormatError
+Error
+ExceptionInInitializerError
+IllegalAccessError
+IncompatibleClassChangeError
+InstantiationError
+InternalError
+LinkageError
+NoClassDefFoundError
+NoSuchFieldError
+NoSuchMethodError
+OutOfMemoryError
+StackOverflowError
+ThreadDeath
+UnknownError
+UnsatisfiedLinkError
+UnsupportedClassVersionError
+VerifyError
+VirtualMachineError
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/java.lang-classes-1.3.txt b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/java.lang-classes-1.3.txt
new file mode 100644
index 0000000..119423d
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/java.lang-classes-1.3.txt
@@ -0,0 +1,79 @@
+Cloneable
+Comparable
+Runnable
+Boolean
+Byte
+Character
+Character.Subset
+Character.UnicodeBlock
+Class
+ClassLoader
+Compiler
+Double
+Float
+InheritableThreadLocal
+Integer
+Long
+Math
+Number
+Object
+Package
+Process
+Runtime
+RuntimePermission
+SecurityManager
+Short
+StrictMath
+String
+StringBuffer
+System
+Thread
+ThreadGroup
+ThreadLocal
+Throwable
+Void
+ArithmeticException
+ArrayIndexOutOfBoundsException
+ArrayStoreException
+ClassCastException
+ClassNotFoundException
+CloneNotSupportedException
+Exception
+IllegalAccessException
+IllegalArgumentException
+IllegalMonitorStateException
+IllegalStateException
+IllegalThreadStateException
+IndexOutOfBoundsException
+InstantiationException
+InterruptedException
+NegativeArraySizeException
+NoSuchFieldException
+NoSuchMethodException
+NullPointerException
+NumberFormatException
+RuntimeException
+SecurityException
+StringIndexOutOfBoundsException
+UnsupportedOperationException
+AbstractMethodError
+ClassCircularityError
+ClassFormatError
+Error
+ExceptionInInitializerError
+IllegalAccessError
+IncompatibleClassChangeError
+InstantiationError
+InternalError
+LinkageError
+NoClassDefFoundError
+NoSuchFieldError
+NoSuchMethodError
+OutOfMemoryError
+StackOverflowError
+ThreadDeath
+UnknownError
+UnsatisfiedLinkError
+UnsupportedClassVersionError
+VerifyError
+VirtualMachineError
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/java.lang-classes-1.4.txt b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/java.lang-classes-1.4.txt
new file mode 100644
index 0000000..81a442d
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/java.lang-classes-1.4.txt
@@ -0,0 +1,82 @@
+CharSequence
+Cloneable
+Comparable
+Runnable
+Boolean
+Byte
+Character
+Character.Subset
+Character.UnicodeBlock
+Class
+ClassLoader
+Compiler
+Double
+Float
+InheritableThreadLocal
+Integer
+Long
+Math
+Number
+Object
+Package
+Process
+Runtime
+RuntimePermission
+SecurityManager
+Short
+StackTraceElement
+StrictMath
+String
+StringBuffer
+System
+Thread
+ThreadGroup
+ThreadLocal
+Throwable
+Void
+ArithmeticException
+ArrayIndexOutOfBoundsException
+ArrayStoreException
+ClassCastException
+ClassNotFoundException
+CloneNotSupportedException
+Exception
+IllegalAccessException
+IllegalArgumentException
+IllegalMonitorStateException
+IllegalStateException
+IllegalThreadStateException
+IndexOutOfBoundsException
+InstantiationException
+InterruptedException
+NegativeArraySizeException
+NoSuchFieldException
+NoSuchMethodException
+NullPointerException
+NumberFormatException
+RuntimeException
+SecurityException
+StringIndexOutOfBoundsException
+UnsupportedOperationException
+AbstractMethodError
+AssertionError
+ClassCircularityError
+ClassFormatError
+Error
+ExceptionInInitializerError
+IllegalAccessError
+IncompatibleClassChangeError
+InstantiationError
+InternalError
+LinkageError
+NoClassDefFoundError
+NoSuchFieldError
+NoSuchMethodError
+OutOfMemoryError
+StackOverflowError
+ThreadDeath
+UnknownError
+UnsatisfiedLinkError
+UnsupportedClassVersionError
+VerifyError
+VirtualMachineError
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/java.lang-classes-1.5.txt b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/java.lang-classes-1.5.txt
new file mode 100644
index 0000000..2439f2e
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/java.lang-classes-1.5.txt
@@ -0,0 +1,90 @@
+Appendable
+CharSequence
+Cloneable
+Comparable
+Iterable
+Readable
+Runnable
+Thread.UncaughtExceptionHandler
+Boolean
+Byte
+Character
+Character.Subset
+Character.UnicodeBlock
+Class
+ClassLoader
+Compiler
+Double
+Enum
+Float
+InheritableThreadLocal
+Integer
+Long
+Math
+Number
+Object
+Package
+Process
+ProcessBuilder
+Runtime
+RuntimePermission
+SecurityManager
+Short
+StackTraceElement
+StrictMath
+String
+StringBuffer
+StringBuilder
+System
+Thread
+ThreadGroup
+ThreadLocal
+Throwable
+Void
+ArithmeticException
+ArrayIndexOutOfBoundsException
+ArrayStoreException
+ClassCastException
+ClassNotFoundException
+CloneNotSupportedException
+Exception
+IllegalAccessException
+IllegalArgumentException
+IllegalMonitorStateException
+IllegalStateException
+IllegalThreadStateException
+IndexOutOfBoundsException
+InstantiationException
+InterruptedException
+NegativeArraySizeException
+NoSuchFieldException
+NoSuchMethodException
+NullPointerException
+NumberFormatException
+RuntimeException
+SecurityException
+StringIndexOutOfBoundsException
+TypeNotPresentException
+UnsupportedOperationException
+AbstractMethodError
+AssertionError
+ClassCircularityError
+ClassFormatError
+Error
+ExceptionInInitializerError
+IllegalAccessError
+IncompatibleClassChangeError
+InstantiationError
+InternalError
+LinkageError
+NoClassDefFoundError
+NoSuchFieldError
+NoSuchMethodError
+OutOfMemoryError
+StackOverflowError
+ThreadDeath
+UnknownError
+UnsatisfiedLinkError
+UnsupportedClassVersionError
+VerifyError
+VirtualMachineError
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/rng/gjdoc-classdoc.rng b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/rng/gjdoc-classdoc.rng
new file mode 100644
index 0000000..085710d
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/rng/gjdoc-classdoc.rng
@@ -0,0 +1,649 @@
+<?xml version="1.0"?>
+
+<!-- gjdoc-classdoc.rng
+     Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA. -->
+
+<grammar 
+      xmlns="http://relaxng.org/ns/structure/1.0" 
+      xmlns:a="http://relaxng.org/ns/annotation/1.0" 
+      xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml">
+
+   <include href="gjdoc-common.rng"/>
+   
+   <a:documentation>
+      The Relax NG grammar for an classdoc XML document generated by
+      GNU Gjdoc.
+   </a:documentation>
+
+   <start>
+      <a:documentation>
+	 The root element for a Gjdoc classdoc XML document.
+      </a:documentation>
+
+      <element name="gjdoc:classdoc">
+	 <a:documentation>
+	    Corresponds to a Javadoc API com.sun.javadoc.ClassDoc
+	    object, the subtree of the full generated documentation
+	    corresponding to a particular Java class.
+	 </a:documentation>
+
+	 <ref name="name-attribute"/>
+	 <ref name="qualifiedtypename-attribute"/>
+
+	 <optional>
+	    <ref name="superclass-element"/>
+	 </optional>
+
+	 <zeroOrMore>
+	    <ref name="implements-element"/>
+	 </zeroOrMore>
+
+	 <zeroOrMore>
+	    <ref name="superimplements-element"/>
+	 </zeroOrMore>
+
+	 <ref name="ProgramElementDocBody"/>
+
+	 <optional>
+	    <ref name="isAbstract-element"/>
+	 </optional>
+
+	 <optional>
+	    <ref name="isSerializable-element"/>
+	 </optional>
+
+	 <optional>
+	    <ref name="isExternalizable-element"/>
+	 </optional>
+
+	 <optional>
+	    <ref name="definesSerializableFields-element"/>
+	 </optional>
+
+	 <zeroOrMore>
+	    <ref name="constructordoc-element"/>
+	 </zeroOrMore>
+
+	 <zeroOrMore>
+	    <ref name="methoddoc-element"/>
+	 </zeroOrMore>
+
+	 <zeroOrMore>
+	    <ref name="fielddoc-element"/>
+	 </zeroOrMore>
+
+      </element>      
+
+   </start>
+
+   <!-- The following patterns are "body" patterns for the element
+   patterns below. Their content corresponds to the abstract
+   superclasses of the classes which are represented by the "element"
+   patterns below.  -->
+
+   <define name="DocBody">
+      <a:documentation>
+	 Corresponds to the abstract class
+	 <code>com.sun.javadoc.Doc</code>, the common base class for
+	 all documentation classes.
+      </a:documentation>
+
+      <optional>
+	 <ref name="isClass-element"/>
+      </optional>
+
+      <optional>
+	 <ref name="isConstructor-element"/>
+      </optional>
+
+      <optional>
+	 <ref name="isError-element"/>
+      </optional>
+
+      <optional>
+	 <ref name="isException-element"/>
+      </optional>
+
+      <optional>
+	 <ref name="isField-element"/>
+      </optional>
+
+      <optional>
+	 <ref name="isIncluded-element"/>
+      </optional>
+
+      <optional>
+	 <ref name="isInterface-element"/>
+      </optional>
+
+      <optional>
+	 <ref name="isMethod-element"/>
+      </optional>
+
+      <optional>
+	 <ref name="isOrdinaryClass-element"/>
+      </optional>
+
+      <optional>
+	 <ref name="inlineTags-element"/>
+      </optional>
+
+      <optional>
+	 <ref name="firstSentenceTags-element"/>
+      </optional>
+
+      <optional>
+	 <ref name="tags-element"/>
+      </optional>
+
+      <optional>
+	 <ref name="seeTags-element"/>
+      </optional>
+
+   </define>
+
+   <define name="ProgramElementDocBody">
+      <a:documentation>
+	 Corresponds to the abstract class
+	 <code>com.sun.javadoc.ProgramElementDoc</code>.
+      </a:documentation>
+
+      <!-- ... which is derived from class com.sun.javadoc.Doc -->
+      <ref name="DocBody"/>
+
+      <ref name="containingPackage-element"/>
+
+      <optional>
+	 <ref name="containingClass-element"/>
+      </optional>
+      
+      <ref name="access-element"/>
+      
+      <optional>
+	 <ref name="isFinal-element"/>
+      </optional>
+
+      <optional>
+	 <ref name="isStatic-element"/>
+      </optional>
+
+   </define>
+
+   <define name="MemberDocBody">
+      <a:documentation>
+	 Corresponds to the abstract class
+	 <code>com.sun.javadoc.MemberDoc</code>.
+      </a:documentation>
+
+      <!-- ... which is derived from class
+      com.sun.javadoc.ProgramElementDoc -->
+      <ref name="ProgramElementDocBody"/>
+
+   </define>
+
+   <define name="ExecutableMemberDocBody">
+      <a:documentation>
+	 Corresponds to the abstract class
+	 <code>com.sun.javadoc.ExecutableMemberDoc</code>.
+      </a:documentation>
+
+      <!-- ... which is derived from class 
+      com.sun.javadoc.MemberDoc -->
+      <ref name="MemberDocBody"/>
+
+      <zeroOrMore>
+	 <ref name="parameter-element"/>
+      </zeroOrMore>
+
+      <zeroOrMore>
+	 <ref name="thrownException-element"/>
+      </zeroOrMore>
+
+      <ref name="signature-element"/>
+
+      <optional>
+	 <ref name="isNative-element"/>
+      </optional>
+
+      <optional>
+	 <ref name="isSynchronized-element"/>
+      </optional>
+
+   </define>
+
+   <define name="ConstructorDocBody">
+      <a:documentation>
+	 Corresponds to an object of class
+	 <code>com.sun.javadoc.ConstructorDoc</code>.
+      </a:documentation>
+
+      <!-- ... which is derived from class
+      com.sun.javadoc.ExecutableMemberDoc -->
+      <ref name="ExecutableMemberDocBody"/>
+
+   </define>
+
+   <define name="MethodDocBody">
+      <a:documentation>
+	 Corresponds to an object of class
+	 <code>com.sun.javadoc.MethodDoc</code>.
+      </a:documentation>
+
+      <!-- ... which is derived from class
+      com.sun.javadoc.ExecutableMemberDoc -->
+      <ref name="ExecutableMemberDocBody"/>
+
+      <ref name="returns-element"/>
+   </define>
+
+   <define name="FieldDocBody">
+      <a:documentation>
+	 Corresponds to an object of class
+	 <code>com.sun.javadoc.FieldDoc</code>.
+      </a:documentation>
+
+      <!-- ... which is derived from class
+      com.sun.javadoc.ProgramElementDoc -->
+      <ref name="ProgramElementDocBody"/>
+
+      <optional>
+	 <ref name="isTransient-element"/>
+      </optional>
+
+      <optional>
+	 <ref name="isVolatile-element"/>
+      </optional>
+
+      <element name="gjdoc:type">
+	 <ref name="typedef-attributes"/>
+      </element>
+
+   </define>
+
+
+   <!-- The following patterns define the elements representing
+   concrete classes in the Javadoc API. -->
+
+   <define name="constructordoc-element">
+      <a:documentation>
+	 Specifies a constructor of the class.
+      </a:documentation>
+
+      <element name="gjdoc:constructordoc">
+	 <ref name="name-attribute"/>
+	 <ref name="ConstructorDocBody"/>
+      </element>
+   </define>
+
+   <define name="methoddoc-element">
+      <a:documentation>
+	 Specifies a method of the class.
+      </a:documentation>
+
+      <element name="gjdoc:methoddoc">
+	 <ref name="name-attribute"/>
+	 <ref name="MethodDocBody"/>
+      </element>
+   </define>
+
+   <define name="fielddoc-element">
+      <a:documentation>
+	 Specifies a field of the class.
+      </a:documentation>
+
+      <element name="gjdoc:fielddoc">
+	 <ref name="name-attribute"/>
+	 <ref name="FieldDocBody"/>
+      </element>
+   </define>
+
+   <!-- The following patterns represent the return value of the
+   corresponding boolean getters of various classes in
+   <code>com.sun.javadoc</code>. The presence of each tag denotes a
+   return value of <code>true</code>, absence denotes a return value
+   of <code>false</code>. -->
+
+   <define name="isAbstract-element">
+      <a:documentation>
+	 Presence means <code>ClassDoc.isAbstract()</code> returns
+	 <code>true</code>.
+      </a:documentation>
+
+      <element name="gjdoc:isAbstract">
+	 <empty/>
+      </element>
+   </define>
+
+   <define name="isClass-element">
+      <a:documentation>
+	 Presence means <code>Doc.isClass()</code> returns
+	 <code>true</code>.
+      </a:documentation>
+
+      <element name="gjdoc:isClass">
+	 <empty/>
+      </element>
+   </define>
+
+   <define name="isConstructor-element">
+      <a:documentation>
+	 Presence means <code>Doc.isConstructor()</code> returns
+	 <code>true</code>.
+      </a:documentation>
+
+      <element name="gjdoc:isConstructor">
+	 <empty/>
+      </element>
+   </define>
+
+   <define name="isError-element">
+      <a:documentation>
+	 Presence means <code>Doc.isError()</code> returns
+	 <code>true</code>.
+      </a:documentation>
+
+      <element name="gjdoc:isError">
+	 <empty/>
+      </element>
+   </define>
+
+   <define name="isException-element">
+      <a:documentation>
+	 Presence means <code>Doc.isException()</code> returns
+	 <code>true</code>.
+      </a:documentation>
+
+      <element name="gjdoc:isException">
+	 <empty/>
+      </element>
+   </define>
+
+   <define name="isSerializable-element">
+      <a:documentation>
+	 Presence means <code>ClassDoc.isSerializable()</code> returns
+	 <code>true</code>.
+      </a:documentation>
+
+      <element name="gjdoc:isSerializable">
+	 <empty/>
+      </element>
+   </define>
+
+   <define name="isExternalizable-element">
+      <a:documentation>
+	 Presence means <code>ClassDoc.isExternalizable()</code>
+	 returns <code>true</code>.
+      </a:documentation>
+
+      <element name="gjdoc:isExternalizable">
+	 <empty/>
+      </element>
+   </define>
+
+   <define name="isField-element">
+      <a:documentation>
+	 Presence means <code>Doc.isField()</code> returns
+	 <code>true</code>.
+      </a:documentation>
+
+      <element name="gjdoc:isField">
+	 <empty/>
+      </element>
+   </define>
+
+   <define name="isIncluded-element">
+      <a:documentation>
+	 Presence means <code>Doc.isIncluded()</code> returns
+	 <code>true</code>.
+      </a:documentation>
+
+      <element name="gjdoc:isIncluded">
+	 <empty/>
+      </element>
+   </define>
+
+   <define name="isInterface-element">
+      <a:documentation>
+	 Presence means <code>Doc.isInterface()</code> returns
+	 <code>true</code>.
+      </a:documentation>
+
+      <element name="gjdoc:isInterface">
+	 <empty/>
+      </element>
+   </define>
+
+   <define name="isMethod-element">
+      <a:documentation>
+	 Presence means <code>Doc.isMethod()</code> returns
+	 <code>true</code>.
+      </a:documentation>
+
+      <element name="gjdoc:isMethod">
+	 <empty/>
+      </element>
+   </define>
+
+   <define name="isOrdinaryClass-element">
+      <a:documentation>
+	 Presence means <code>Doc.isOrdinaryClass()</code> returns
+	 <code>true</code>.
+      </a:documentation>
+
+      <element name="gjdoc:isOrdinaryClass">
+	 <empty/>
+      </element>
+   </define>
+
+   <define name="isFinal-element">
+      <a:documentation>
+	 Presence means <code>ProgramElementDoc.isFinal()</code>
+	 returns <code>true</code>.
+      </a:documentation>
+
+      <element name="gjdoc:isFinal">
+	 <empty/>
+      </element>
+   </define>
+
+   <define name="isStatic-element">
+      <a:documentation>
+	 Presence means <code>ProgramElementDoc.isStatic()</code>
+	 returns <code>true</code>.
+      </a:documentation>
+
+      <element name="gjdoc:isStatic">
+	 <empty/>
+      </element>
+   </define>
+
+   <define name="isTransient-element">
+      <a:documentation>
+	 Presence means <code>FieldDoc.isTransient()</code>
+	 returns <code>true</code>.
+      </a:documentation>
+
+      <element name="gjdoc:isTransient">
+	 <empty/>
+      </element>
+   </define>
+
+   <define name="isVolatile-element">
+      <a:documentation>
+	 Presence means <code>FieldDoc.isVolatile()</code>
+	 returns <code>true</code>.
+      </a:documentation>
+
+      <element name="gjdoc:isVolatile">
+	 <empty/>
+      </element>
+   </define>
+
+   <define name="isNative-element">
+      <a:documentation>
+	 Presence means <code>ExecutableMemberDoc.isNative()</code>
+	 returns <code>true</code>.
+      </a:documentation>
+
+      <element name="gjdoc:isNative">
+	 <empty/>
+      </element>
+   </define>
+
+   <define name="isSynchronized-element">
+      <a:documentation>
+	 Presence means
+	 <code>ExecutableMemberDoc.isSynchronized()</code> returns
+	 <code>true</code>.
+      </a:documentation>
+
+      <element name="gjdoc:isSynchronized">
+	 <empty/>
+      </element>
+   </define>
+
+   <define name="definesSerializableFields-element">
+      <a:documentation>
+	 Presence means
+	 <code>ClassDoc.definesSerializableFields()</code> returns
+	 <code>true</code>.
+      </a:documentation>
+
+      <element name="gjdoc:definesSerializableFields">
+	 <empty/>
+      </element>
+   </define>
+
+   <define name="access-element">
+      <a:documentation>
+	 Corresponds to the access modifier (public, protected,
+	 private) specified by a ProgramElementDoc.
+      </a:documentation>
+
+      <element name="gjdoc:access">
+	 <attribute name="scope">
+	    <a:documentation>
+	       This value is determined by calling
+	       <code>ProgramElementDoc.isPublic()</code>,
+	       <code>ProgramElementDoc.isProtected()</code>,
+	       <code>ProgramElementDoc.isPrivate()</code> and
+	       <code>ProgramElementDoc.isPackagePrivate()</code>.
+	    </a:documentation>
+	    <choice>
+	       <value>public</value>
+	       <value>protected</value>
+	       <value>private</value>
+	       <value>package</value>
+	    </choice>
+	 </attribute>
+      </element>
+   </define>
+
+   <define name="containingClass-element">
+      <a:documentation>
+	 Corresponds to the type returned by a call to
+	 <code>com.sun.javadoc.Classdoc.containingClass()</code>.
+      </a:documentation>
+
+      <element name="gjdoc:containingClass">
+	 <a:documentation>
+	    The full name of the outer class containing the class, if
+	    this class is an inner class.
+	 </a:documentation>
+	 <ref name="typedef-attributes"/>
+      </element>
+   </define>
+
+   <define name="parameter-element">
+      <a:documentation>
+	 Corresponds to an entry in the array returned by a
+	 <code>com.sun.javadoc.ExecutableMemberDoc.parameters()</code>.
+      </a:documentation>
+
+      <element name="gjdoc:parameter">
+	 <a:documentation>
+	    A parameter for a method or constructor call.
+	 </a:documentation>
+	 <ref name="name-attribute"/>	 
+	 <optional>
+	    <ref name="typedef-attributes"/>
+	 </optional>
+      </element>
+   </define>
+
+   <define name="thrownException-element">
+      <a:documentation>
+	 Corresponds to an entry in the array returned by a
+	 <code>com.sun.javadoc.ExecutableMemberDoc.thrownExceptions()</code>.
+      </a:documentation>
+
+      <element name="gjdoc:thrownException">
+	 <a:documentation>
+	    An exception thrown by a method or constructor.
+	 </a:documentation>
+	 <ref name="typedef-attributes"/>
+      </element>
+   </define>
+
+
+   <define name="signature-element">
+      <a:documentation>
+	 Corresponds to the signature specified by a
+	 <code>com.sun.javadoc.MethodDoc</code>.
+      </a:documentation>
+
+      <element name="gjdoc:signature">
+	 <a:documentation>
+	    The signature of a method or constructor.
+	 </a:documentation>
+	 <attribute name="full">
+	    <a:documentation>
+	       The full signature of a method or constructor, as
+	       returned by
+	       <code>com.sun.javadoc.ExecutableMemberDoc.signature()</code>.
+	    </a:documentation>
+	    <text/>
+	 </attribute>
+	 <attribute name="flat">
+	    <a:documentation>
+	       The "flat" signature of a method or constructor, as
+	       returned by
+	       <code>com.sun.javadoc.ExecutableMemberDoc.flatSignature()</code>.
+	    </a:documentation>
+	    <text/>
+	 </attribute>
+      </element>
+   </define>
+
+   <define name="returns-element">
+      <a:documentation>
+	 Corresponds to the type returned by
+	 <code>com.sun.javadoc.MethodDoc.returnType()</code>.
+      </a:documentation>
+
+      <element name="gjdoc:returns">
+	 <a:documentation>
+	    The type returned by a method.
+	 </a:documentation>
+
+	 <ref name="typedef-attributes"/>
+      </element>
+   </define>
+</grammar>
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/rng/gjdoc-common.rng b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/rng/gjdoc-common.rng
new file mode 100644
index 0000000..85ffc1d
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/rng/gjdoc-common.rng
@@ -0,0 +1,264 @@
+<?xml version="1.0"?>
+
+<!-- gjdoc-common.rng
+     Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA. -->
+
+<grammar 
+      xmlns="http://relaxng.org/ns/structure/1.0" 
+      xmlns:a="http://relaxng.org/ns/annotation/1.0" 
+      xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml">
+   
+   <a:documentation>
+      A Relax NG grammar with definitions of elements and attributes
+      used by both the XML index file and the XML class files
+      generated by GNU Gjdoc.
+   </a:documentation>
+
+   <define name="firstSentenceTags-element">
+      <a:documentation>
+
+      </a:documentation>
+
+      <element name="gjdoc:firstSentenceTags">
+	 <ref name="tags-contents"/>
+      </element>
+   </define>
+
+   <define name="inlineTags-element">
+      <a:documentation>
+
+      </a:documentation>
+
+      <element name="gjdoc:inlineTags">
+	 <ref name="tags-contents"/>
+      </element>
+   </define>
+
+   <define name="seeTags-element">
+      <a:documentation>
+
+      </a:documentation>
+
+      <element name="gjdoc:seeTags">
+	 <ref name="tags-contents"/>
+      </element>
+   </define>
+
+
+   <define name="tags-element">
+      <a:documentation>
+
+      </a:documentation>
+
+      <element name="gjdoc:tags">
+	 <ref name="tags-contents"/>
+      </element>
+   </define>
+
+   <define name="tags-contents">
+      <a:documentation>
+	 Specifies mixed content comprised of gjdoc tags,
+	 HTML tags, taglet output, and text.
+      </a:documentation>
+
+      <zeroOrMore>
+	 <ref name="TagContent"/>
+      </zeroOrMore>
+   </define>
+
+   <define name="implements-element">
+      <element name="gjdoc:implements">
+	 <a:documentation>
+	    Specifies an interface that the class implements.
+	 </a:documentation>
+	 
+	 <ref name="typedef-attributes"/>
+      </element>
+   </define>
+
+
+   <define name="superimplements-element">
+      <element name="gjdoc:superimplements">
+	 <a:documentation>
+	    Specifies an interface implemented by superclasses
+	    (ancestors) of the class. Together with the interfaces
+	    specified with tag `implements', this lists all interfaces
+	    the class can be cast to.
+	 </a:documentation>
+	 
+	 <ref name="typedef-attributes"/>
+      </element>
+   </define>
+
+   <define name="typedef-attributes">
+      <attribute name="typename">
+	 <a:documentation>
+	    The name of the class, without package prefix. If the
+	    class is an inner class, this includes the name of its
+	    outer class.
+	 </a:documentation>
+
+	 <text/>
+      </attribute>
+      
+      <ref name="qualifiedtypename-attribute"/>
+
+      <optional>
+	 <attribute name="dimension">
+	    <a:documentation>
+	       The dimension of this typedef, represented by a zero or
+	       more repetitions of the string "[]".
+	    </a:documentation>
+
+	    <text/>
+	 </attribute>
+      </optional>
+   </define>
+
+   <define name="name-attribute">
+      <attribute name="name">
+	 <a:documentation>
+	    The name of some Java Entity (package, class, constructor,
+	    method, field.)
+	 </a:documentation>
+
+	 <text/>
+      </attribute>
+   </define>
+
+   <define name="qualifiedtypename-attribute">
+      <attribute name="qualifiedtypename">
+	 <a:documentation>
+	    The fully qualified name of the class.
+	 </a:documentation>
+
+	 <text/>
+      </attribute>
+   </define>
+
+   <define name="superclass-element">
+      <element name="gjdoc:superclass">
+	 <a:documentation>
+	    Specifies the superclass of the class.
+	 </a:documentation>
+	 
+	 <ref name="typedef-attributes"/>
+      </element>
+   </define>
+
+   <define name="tag-element">
+      <element name="gjdoc:tag">
+	 <ref name="name-attribute"/>
+	 <attribute name="kind">
+	    <text/>
+	 </attribute>
+	 <zeroOrMore>
+	    <ref name="TagContent"/>
+	 </zeroOrMore>
+      </element>
+   </define>
+
+   <define name="exception-element">
+      <element name="gjdoc:exception">
+	 <ref name="typedef-attributes"/>
+      </element>
+   </define>
+
+   <define name="TagContent">
+      <choice>
+	 <element>
+	    <anyName>
+	       <except>
+		  <nsName ns="gjdoc"/>
+		  <name>gjdoc:tag</name>
+	       </except>
+	    </anyName>
+	    <zeroOrMore>
+	       <attribute>
+		  <anyName/>
+	       </attribute>
+	    </zeroOrMore>
+	    <zeroOrMore>
+	       <choice>
+		  <text/>
+		  <ref name="TagContent"/>
+	       </choice>
+	    </zeroOrMore>
+	 </element>
+	 <ref name="tag-element"/>
+	 <ref name="exception-element"/>
+	 <ref name="tagletText-element"/>
+	 <text/>
+      </choice>
+   </define>
+
+   <define name="containingPackage-element">
+      <element name="gjdoc:containingPackage">
+	 <a:documentation>
+	    The full name of the package containing the class.
+	 </a:documentation>
+	 <attribute name="name">
+	    <text/>
+	 </attribute>
+      </element>
+   </define>
+
+   <define name="tagletText-element">
+      <element name="gjdoc:tagletText">
+	 <a:documentation>
+	    A string generated by a Taglet.toString() method.
+	 </a:documentation>
+	 <attribute name="tagName">
+            <a:documentation>
+               The name of the tag this Taglet was assigned to.
+            </a:documentation>
+	    <text/>
+	 </attribute>
+      </element>
+   </define>
+
+   <define name="isError-element">
+      <element name="gjdoc:isError">
+	 <a:documentation>
+	    Exists when the described class is a subclass of
+	    java.lang.Error.
+	 </a:documentation>
+      </element>
+   </define>
+
+   <define name="isException-element">
+      <element name="gjdoc:isException">
+	 <a:documentation>
+	    Exists when the described class is a subclass of
+	    java.lang.Exception.
+	 </a:documentation>
+      </element>
+   </define>
+
+   <define name="isInterface-element">
+      <element name="gjdoc:isInterface">
+	 <a:documentation>
+	    Exists when the described class is an interface.
+	 </a:documentation>
+      </element>
+   </define>
+
+</grammar>
+
diff --git a/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/rng/gjdoc-index.rng b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/rng/gjdoc-index.rng
new file mode 100644
index 0000000..b788556
--- /dev/null
+++ b/libjava/classpath/tools/resource/gnu/classpath/tools/gjdoc/rng/gjdoc-index.rng
@@ -0,0 +1,176 @@
+<?xml version="1.0"?>
+
+<!-- gjdoc-index.rng
+     Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA. -->
+
+<grammar 
+      xmlns="http://relaxng.org/ns/structure/1.0" 
+      xmlns:a="http://relaxng.org/ns/annotation/1.0" 
+      xmlns:gjdoc="http://www.gnu.org/software/cp-tools/gjdocxml">
+
+   <include href="gjdoc-common.rng"/>
+   
+   <a:documentation>
+      The Relax NG grammar for the XML index file generated by GNU
+      Gjdoc.
+   </a:documentation>
+
+   <start>
+      <a:documentation>
+	 The root element for a Gjdoc index XML document.
+      </a:documentation>
+
+      <element name="gjdoc:rootdoc">
+	 <a:documentation>
+	    Corresponds to the Javadoc API RootDoc object, the root of
+	    the generated documentation.
+	 </a:documentation>
+   
+	 <zeroOrMore>
+	    <ref name="specifiedclass-element"/>
+	 </zeroOrMore>
+	 
+	 <zeroOrMore>
+	    <ref name="specifiedpackage-element"/>
+	 </zeroOrMore>
+	 
+	 <zeroOrMore>
+	    <ref name="packagedoc-element"/>
+	 </zeroOrMore>
+
+	 <zeroOrMore>
+	    <ref name="classdoc-element"/>
+	 </zeroOrMore>
+      </element>
+   </start>
+   
+   <define name="containsClass-element">
+      <element name="gjdoc:containsClass">
+	 <a:documentation>
+	    Corresponds to a class contained in a package or in
+	    another class.
+	 </a:documentation>
+
+	 <ref name="qualifiedtypename-attribute"/>
+      </element>
+   </define>
+
+   <define name="specifiedclass-element">
+      <element name="gjdoc:specifiedclass">
+	 <a:documentation>
+	    Corresponds to a class named on the Gjdoc command
+	    line.  This is a class the user explicitly wants
+	    documentation generated for.
+	 </a:documentation>
+	 
+	 <attribute name="name">
+	    <a:documentation>
+	       The name of the class as given by the user on the command
+	       line. (CHECK)
+	    </a:documentation>	    
+
+	    <text/>
+	 </attribute>
+      </element>
+   </define>
+
+   <define name="specifiedpackage-element">
+      <element name="gjdoc:specifiedpackage">
+	 <a:documentation>
+	    Corresponds to a package named on the Gjdoc command
+	    line.  This is a package the user explicitly wants
+	    documentation generated for.
+	 </a:documentation>
+	 
+	 <attribute name="name">
+	    <a:documentation>
+	       The full name of the package.
+	    </a:documentation>
+	    
+	    <text/>
+	 </attribute>
+      </element>
+   </define>
+
+   <define name="packagedoc-element">
+      <element name="gjdoc:packagedoc">
+	 <a:documentation>
+	    Corresponds to a package for which XML documentation
+	    has been generated.  This is not necessarily a package
+	    the user requested generation for.
+	 </a:documentation>
+
+	 <ref name="name-attribute"/>
+	 <ref name="firstSentenceTags-element"/>
+
+	 <zeroOrMore>
+	    <ref name="containsClass-element"/>
+	 </zeroOrMore>	    
+      </element>
+   </define>
+
+   <define name="classdoc-element">
+      <element name="gjdoc:classdoc">
+	 <a:documentation>
+	    Corresponds to a class for which XML documentation has
+	    been generated.
+	 </a:documentation>
+	       
+	 <ref name="name-attribute"/>
+	 <ref name="qualifiedtypename-attribute"/>
+
+	 <optional>
+	    <a:documentation>
+	       The following is optional because the root class
+	       java.lang.Object does not have a superclass. For all
+	       other classes, this element should be specified.
+	    </a:documentation>
+
+	    <ref name="superclass-element"/>
+	 </optional>
+
+	 <zeroOrMore>
+	    <ref name="implements-element"/>
+	 </zeroOrMore>
+
+	 <zeroOrMore>
+	    <ref name="superimplements-element"/>
+	 </zeroOrMore>
+
+	 <ref name="containingPackage-element"/>
+
+	 <zeroOrMore>
+	    <ref name="isError-element"/>
+	 </zeroOrMore>
+
+	 <zeroOrMore>
+	    <ref name="isException-element"/>
+	 </zeroOrMore>
+
+	 <zeroOrMore>
+	    <ref name="isInterface-element"/>
+	 </zeroOrMore>
+
+	 <zeroOrMore>
+	    <ref name="containsClass-element"/>
+	 </zeroOrMore>
+      </element>
+   </define>
+</grammar>
author	Matthias Klose <doko@gcc.gnu.org>	2008-10-21 17:55:01 +0000
committer	Matthias Klose <doko@gcc.gnu.org>	2008-10-21 17:55:01 +0000
commit	cd6d4007aa4f72b51756e4a571abf876fa3e3133 (patch)
tree	6de8da5758622565799768e49cd0de6698ca3cb8 /libjava/classpath/tools/resource
parent	d9cc481a359c713f473a136730e4019124368d6b (diff)
download	gcc-cd6d4007aa4f72b51756e4a571abf876fa3e3133.zip gcc-cd6d4007aa4f72b51756e4a571abf876fa3e3133.tar.gz gcc-cd6d4007aa4f72b51756e4a571abf876fa3e3133.tar.bz2